diff --git a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/BasicClientFragment.kt b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/BasicClientFragment.kt
index fcb88262a3d161..3f1692f6720795 100644
--- a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/BasicClientFragment.kt
+++ b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/BasicClientFragment.kt
@@ -137,7 +137,7 @@ class BasicClientFragment : Fragment() {
         showMessage("[Read Success] $attributeName: $value")
       }
 
-    }, devicePtr, listOf(ChipAttributePath.newInstance(endpointId.toLong(), clusterId, attributeId)), null, false, 0 /* imTimeoutMs */)
+    }, devicePtr, listOf(ChipAttributePath.newInstance(endpointId, clusterId, attributeId)), null, false, 0 /* imTimeoutMs */)
   }
 
   private fun makeAttributeList() {
@@ -160,7 +160,7 @@ class BasicClientFragment : Fragment() {
         showMessage("Write ${attribute.name} success")
       }
 
-    }, devicePtr, listOf(AttributeWriteRequest.newInstance(addressUpdateFragment.endpointId.toLong(), clusterId, attribute.id, tlv, Optional.empty())), 0, 0)
+    }, devicePtr, listOf(AttributeWriteRequest.newInstance(addressUpdateFragment.endpointId, clusterId, attribute.id, tlv, Optional.empty())), 0, 0)
   }
 
   private fun showMessage(msg: String) {
diff --git a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/OnOffClientFragment.kt b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/OnOffClientFragment.kt
index 9afb3aef436fa0..5088cd05036d76 100644
--- a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/OnOffClientFragment.kt
+++ b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/OnOffClientFragment.kt
@@ -98,7 +98,7 @@ class OnOffClientFragment : Fragment() {
     val clusterId = OnOff.ID
     val attributeId = OnOff.Attribute.OnOff.id
 
-    val attributePath = ChipAttributePath.newInstance(endpointId.toLong(), clusterId, attributeId)
+    val attributePath = ChipAttributePath.newInstance(endpointId, clusterId, attributeId)
 
     ChipClient.getDeviceController(requireContext()).readPath(object: ReportCallback {
       override fun onError(attributePath: ChipAttributePath?, eventPath: ChipEventPath?, ex: java.lang.Exception) {
@@ -140,7 +140,7 @@ class OnOffClientFragment : Fragment() {
     val clusterId = OnOff.ID
     val attributeId = OnOff.Attribute.OnOff.id
 
-    val attributePath = ChipAttributePath.newInstance(endpointId.toLong(), clusterId, attributeId)
+    val attributePath = ChipAttributePath.newInstance(endpointId, clusterId, attributeId)
 
     val subscriptionEstablishedCallback =
             SubscriptionEstablishedCallback {
@@ -209,13 +209,13 @@ class OnOffClientFragment : Fragment() {
     // TODO : Need to be implement poj-to-tlv
     val tlvWriter = TlvWriter()
     tlvWriter.startStructure(AnonymousTag)
-    tlvWriter.put(ContextSpecificTag(0), binding.levelBar.progress.toUInt())
-    tlvWriter.put(ContextSpecificTag(1), 0u)
-    tlvWriter.put(ContextSpecificTag(2), 0u)
-    tlvWriter.put(ContextSpecificTag(3), 0u)
+    tlvWriter.put(ContextSpecificTag(LevelControl.MoveToLevelCommandField.Level.id), binding.levelBar.progress.toUInt())
+    tlvWriter.put(ContextSpecificTag(LevelControl.MoveToLevelCommandField.OptionsMask.id), 0u)
+    tlvWriter.put(ContextSpecificTag(LevelControl.MoveToLevelCommandField.OptionsOverride.id), 0u)
+    tlvWriter.put(ContextSpecificTag(LevelControl.MoveToLevelCommandField.TransitionTime.id), 0u)
     tlvWriter.endStructure()
 
-    val invokeElement = InvokeElement.newInstance(addressUpdateFragment.endpointId.toLong()
+    val invokeElement = InvokeElement.newInstance(addressUpdateFragment.endpointId
             , LevelControl.ID
             , LevelControl.Command.MoveToLevel.id
             , tlvWriter.getEncoded(), null)
@@ -239,7 +239,7 @@ class OnOffClientFragment : Fragment() {
     val tlvWriter = TlvWriter()
     tlvWriter.startStructure(AnonymousTag)
     tlvWriter.endStructure()
-    val invokeElement = InvokeElement.newInstance(addressUpdateFragment.endpointId.toLong()
+    val invokeElement = InvokeElement.newInstance(addressUpdateFragment.endpointId
             , OnOff.ID
             , commandId.id
             , tlvWriter.getEncoded(), null)
diff --git a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/OpCredClientFragment.kt b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/OpCredClientFragment.kt
index bf8e929472833f..15fe990b6a6c4e 100644
--- a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/OpCredClientFragment.kt
+++ b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/OpCredClientFragment.kt
@@ -96,7 +96,7 @@ class OpCredClientFragment : Fragment() {
         showMessage("OpCred $attributeName value: $value")
       }
 
-    }, devicePtr, listOf(ChipAttributePath.newInstance(endpointId.toLong(), clusterId, attributeId)), null, false, 0 /* imTimeoutMs */)
+    }, devicePtr, listOf(ChipAttributePath.newInstance(endpointId, clusterId, attributeId)), null, false, 0 /* imTimeoutMs */)
   }
 
   private fun showMessage(msg: String) {
diff --git a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/SensorClientFragment.kt b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/SensorClientFragment.kt
index 8ccb2591e45e8f..8abe61329a9727 100644
--- a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/SensorClientFragment.kt
+++ b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/SensorClientFragment.kt
@@ -153,7 +153,7 @@ class SensorClientFragment : Fragment() {
       val device = ChipClient.getConnectedDevicePointer(requireContext(), deviceId)
       val callback = makeReadCallback(clusterName, false)
 
-      deviceController.readAttributePath(callback, device, listOf(ChipAttributePath.newInstance(endpointId.toLong(), clusterId, attributeId)), 0)
+      deviceController.readAttributePath(callback, device, listOf(ChipAttributePath.newInstance(endpointId, clusterId, attributeId)), 0)
     } catch (ex: Exception) {
       Log.d(TAG, "Failed to read the sensor : ", ex)
       showMessage(R.string.sensor_client_read_error_text, ex.toString())
@@ -170,7 +170,7 @@ class SensorClientFragment : Fragment() {
       val device = ChipClient.getConnectedDevicePointer(requireContext(), deviceId)
       val callback = makeReadCallback(clusterName, true)
 
-      deviceController.subscribeToAttributePath({ Log.d(TAG, "onSubscriptionEstablished") }, callback, device, listOf(ChipAttributePath.newInstance(endpointId.toLong(), clusterId, attributeId)), MIN_REFRESH_PERIOD_S, MAX_REFRESH_PERIOD_S, 0)
+      deviceController.subscribeToAttributePath({ Log.d(TAG, "onSubscriptionEstablished") }, callback, device, listOf(ChipAttributePath.newInstance(endpointId, clusterId, attributeId)), MIN_REFRESH_PERIOD_S, MAX_REFRESH_PERIOD_S, 0)
       subscribedDevicePtr = device
     } catch (ex: Exception) {
       Log.d(TAG, "Failed to subscribe", ex)
diff --git a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/util/TlvParseUtil.kt b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/util/TlvParseUtil.kt
index 7ed17a0a8068bd..efe14a9f100ebb 100644
--- a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/util/TlvParseUtil.kt
+++ b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/util/TlvParseUtil.kt
@@ -56,8 +56,7 @@ object TlvParseUtil {
 
   fun encode(input: ByteArray): ByteArray {
     val tlvWriter = TlvWriter()
-    val inputByteStringValue = ByteString.copyFrom(input);
-    tlvWriter.put(AnonymousTag, inputByteStringValue)
+    tlvWriter.put(AnonymousTag, input)
     return tlvWriter.getEncoded();
   }
 
diff --git a/scripts/py_matter_idl/matter_idl/generators/java/ClusterIDMapping.jinja b/scripts/py_matter_idl/matter_idl/generators/java/ClusterIDMapping.jinja
index 8230911053dbc3..03e055730c075e 100644
--- a/scripts/py_matter_idl/matter_idl/generators/java/ClusterIDMapping.jinja
+++ b/scripts/py_matter_idl/matter_idl/generators/java/ClusterIDMapping.jinja
@@ -115,6 +115,30 @@ public class ClusterIDMapping {
             }
         }
 
+        {%- for command in cluster.commands | sort(attribute='code') %}
+            {%- if command.input_param -%}
+                public enum {{command.name | upfirst}}CommandField {
+                    {%- for field in (cluster.structs | named(command.input_param)).fields -%} {{field.name | upfirst}}({{field.code}}), {%- endfor -%};
+                    private final int id;
+                    {{command.name | upfirst}}CommandField(int id) {
+                        this.id = id;
+                    }
+
+                    public int getID() {
+                        return id;
+                    }
+                    public static {{command.name | upfirst}}CommandField value(int id) throws NoSuchFieldError {
+                        for ({{command.name | upfirst}}CommandField field : {{command.name | upfirst}}CommandField.values()) {
+                        if (field.getID() == id) {
+                            return field;
+                        }
+                        }
+                        throw new NoSuchFieldError();
+                    }
+                }
+            {%- endif -%}
+        {%- endfor -%}
+
         @Override
         public String getAttributeName(long id) throws NoSuchFieldError {
             return Attribute.value(id).toString();
diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/java/ClusterIDMapping.java b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/java/ClusterIDMapping.java
index 7749f767e5ee0f..86cdd093afe959 100644
--- a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/java/ClusterIDMapping.java
+++ b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/java/ClusterIDMapping.java
@@ -103,9 +103,7 @@ public static Command value(long id) throws NoSuchFieldError {
                 }
                 throw new NoSuchFieldError();
             }
-        }
-
-        @Override
+        }@Override
         public String getAttributeName(long id) throws NoSuchFieldError {
             return Attribute.value(id).toString();
         }
@@ -200,9 +198,7 @@ public static Command value(long id) throws NoSuchFieldError {
                 }
                 throw new NoSuchFieldError();
             }
-        }
-
-        @Override
+        }@Override
         public String getAttributeName(long id) throws NoSuchFieldError {
             return Attribute.value(id).toString();
         }
@@ -298,9 +294,7 @@ public static Command value(long id) throws NoSuchFieldError {
                 }
                 throw new NoSuchFieldError();
             }
-        }
-
-        @Override
+        }@Override
         public String getAttributeName(long id) throws NoSuchFieldError {
             return Attribute.value(id).toString();
         }
diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java
index 2bfb8debf77c91..a8177c5fda8ca4 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java
+++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java
@@ -384,6 +384,53 @@ public static Command value(long id) throws NoSuchFieldError {
       }
     }
 
+    public enum IdentifyCommandField {
+      IdentifyTime(0),
+      ;
+      private final int id;
+
+      IdentifyCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static IdentifyCommandField value(int id) throws NoSuchFieldError {
+        for (IdentifyCommandField field : IdentifyCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum TriggerEffectCommandField {
+      EffectIdentifier(0),
+      EffectVariant(1),
+      ;
+      private final int id;
+
+      TriggerEffectCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static TriggerEffectCommandField value(int id) throws NoSuchFieldError {
+        for (TriggerEffectCommandField field : TriggerEffectCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
     @Override
     public String getAttributeName(long id) throws NoSuchFieldError {
       return Attribute.value(id).toString();
@@ -501,6 +548,123 @@ public static Command value(long id) throws NoSuchFieldError {
       }
     }
 
+    public enum AddGroupCommandField {
+      GroupID(0),
+      GroupName(1),
+      ;
+      private final int id;
+
+      AddGroupCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static AddGroupCommandField value(int id) throws NoSuchFieldError {
+        for (AddGroupCommandField field : AddGroupCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum ViewGroupCommandField {
+      GroupID(0),
+      ;
+      private final int id;
+
+      ViewGroupCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static ViewGroupCommandField value(int id) throws NoSuchFieldError {
+        for (ViewGroupCommandField field : ViewGroupCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum GetGroupMembershipCommandField {
+      GroupList(0),
+      ;
+      private final int id;
+
+      GetGroupMembershipCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static GetGroupMembershipCommandField value(int id) throws NoSuchFieldError {
+        for (GetGroupMembershipCommandField field : GetGroupMembershipCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum RemoveGroupCommandField {
+      GroupID(0),
+      ;
+      private final int id;
+
+      RemoveGroupCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static RemoveGroupCommandField value(int id) throws NoSuchFieldError {
+        for (RemoveGroupCommandField field : RemoveGroupCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum AddGroupIfIdentifyingCommandField {
+      GroupID(0),
+      GroupName(1),
+      ;
+      private final int id;
+
+      AddGroupIfIdentifyingCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static AddGroupIfIdentifyingCommandField value(int id) throws NoSuchFieldError {
+        for (AddGroupIfIdentifyingCommandField field : AddGroupIfIdentifyingCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
     @Override
     public String getAttributeName(long id) throws NoSuchFieldError {
       return Attribute.value(id).toString();
@@ -627,121 +791,248 @@ public static Command value(long id) throws NoSuchFieldError {
       }
     }
 
-    @Override
-    public String getAttributeName(long id) throws NoSuchFieldError {
-      return Attribute.value(id).toString();
+    public enum AddSceneCommandField {
+      GroupID(0),
+      SceneID(1),
+      TransitionTime(2),
+      SceneName(3),
+      ExtensionFieldSets(4),
+      ;
+      private final int id;
+
+      AddSceneCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static AddSceneCommandField value(int id) throws NoSuchFieldError {
+        for (AddSceneCommandField field : AddSceneCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
     }
 
-    @Override
-    public String getEventName(long id) throws NoSuchFieldError {
-      return Event.value(id).toString();
+    public enum ViewSceneCommandField {
+      GroupID(0),
+      SceneID(1),
+      ;
+      private final int id;
+
+      ViewSceneCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static ViewSceneCommandField value(int id) throws NoSuchFieldError {
+        for (ViewSceneCommandField field : ViewSceneCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
     }
 
-    @Override
-    public String getCommandName(long id) throws NoSuchFieldError {
-      return Command.value(id).toString();
+    public enum RemoveSceneCommandField {
+      GroupID(0),
+      SceneID(1),
+      ;
+      private final int id;
+
+      RemoveSceneCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static RemoveSceneCommandField value(int id) throws NoSuchFieldError {
+        for (RemoveSceneCommandField field : RemoveSceneCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
     }
 
-    @Override
-    public long getAttributeID(String name) throws IllegalArgumentException {
-      return Attribute.valueOf(name).getID();
+    public enum RemoveAllScenesCommandField {
+      GroupID(0),
+      ;
+      private final int id;
+
+      RemoveAllScenesCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static RemoveAllScenesCommandField value(int id) throws NoSuchFieldError {
+        for (RemoveAllScenesCommandField field : RemoveAllScenesCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
     }
 
-    @Override
-    public long getEventID(String name) throws IllegalArgumentException {
-      return Event.valueOf(name).getID();
+    public enum StoreSceneCommandField {
+      GroupID(0),
+      SceneID(1),
+      ;
+      private final int id;
+
+      StoreSceneCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static StoreSceneCommandField value(int id) throws NoSuchFieldError {
+        for (StoreSceneCommandField field : StoreSceneCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
     }
 
-    @Override
-    public long getCommandID(String name) throws IllegalArgumentException {
-      return Command.valueOf(name).getID();
+    public enum RecallSceneCommandField {
+      GroupID(0),
+      SceneID(1),
+      TransitionTime(2),
+      ;
+      private final int id;
+
+      RecallSceneCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static RecallSceneCommandField value(int id) throws NoSuchFieldError {
+        for (RecallSceneCommandField field : RecallSceneCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
     }
-  }
 
-  public static class OnOff implements BaseCluster {
-    public static final long ID = 6L;
+    public enum GetSceneMembershipCommandField {
+      GroupID(0),
+      ;
+      private final int id;
 
-    public long getID() {
-      return ID;
+      GetSceneMembershipCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static GetSceneMembershipCommandField value(int id) throws NoSuchFieldError {
+        for (GetSceneMembershipCommandField field : GetSceneMembershipCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
     }
 
-    public enum Attribute {
-      OnOff(0L),
-      GlobalSceneControl(16384L),
-      OnTime(16385L),
-      OffWaitTime(16386L),
-      StartUpOnOff(16387L),
-      GeneratedCommandList(65528L),
-      AcceptedCommandList(65529L),
-      EventList(65530L),
-      AttributeList(65531L),
-      FeatureMap(65532L),
-      ClusterRevision(65533L),
+    public enum EnhancedAddSceneCommandField {
+      GroupID(0),
+      SceneID(1),
+      TransitionTime(2),
+      SceneName(3),
+      ExtensionFieldSets(4),
       ;
-      private final long id;
+      private final int id;
 
-      Attribute(long id) {
+      EnhancedAddSceneCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Attribute value(long id) throws NoSuchFieldError {
-        for (Attribute attribute : Attribute.values()) {
-          if (attribute.getID() == id) {
-            return attribute;
+      public static EnhancedAddSceneCommandField value(int id) throws NoSuchFieldError {
+        for (EnhancedAddSceneCommandField field : EnhancedAddSceneCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
       }
     }
 
-    public enum Event {
+    public enum EnhancedViewSceneCommandField {
+      GroupID(0),
+      SceneID(1),
       ;
-      private final long id;
+      private final int id;
 
-      Event(long id) {
+      EnhancedViewSceneCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Event value(long id) throws NoSuchFieldError {
-        for (Event event : Event.values()) {
-          if (event.getID() == id) {
-            return event;
+      public static EnhancedViewSceneCommandField value(int id) throws NoSuchFieldError {
+        for (EnhancedViewSceneCommandField field : EnhancedViewSceneCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
       }
     }
 
-    public enum Command {
-      Off(0L),
-      On(1L),
-      Toggle(2L),
-      OffWithEffect(64L),
-      OnWithRecallGlobalScene(65L),
-      OnWithTimedOff(66L),
+    public enum CopySceneCommandField {
+      Mode(0),
+      GroupIdentifierFrom(1),
+      SceneIdentifierFrom(2),
+      GroupIdentifierTo(3),
+      SceneIdentifierTo(4),
       ;
-      private final long id;
+      private final int id;
 
-      Command(long id) {
+      CopySceneCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Command value(long id) throws NoSuchFieldError {
-        for (Command command : Command.values()) {
-          if (command.getID() == id) {
-            return command;
+      public static CopySceneCommandField value(int id) throws NoSuchFieldError {
+        for (CopySceneCommandField field : CopySceneCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
@@ -779,16 +1070,19 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class OnOffSwitchConfiguration implements BaseCluster {
-    public static final long ID = 7L;
+  public static class OnOff implements BaseCluster {
+    public static final long ID = 6L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      SwitchType(0L),
-      SwitchActions(16L),
+      OnOff(0L),
+      GlobalSceneControl(16384L),
+      OnTime(16385L),
+      OffWaitTime(16386L),
+      StartUpOnOff(16387L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -839,6 +1133,12 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
+      Off(0L),
+      On(1L),
+      Toggle(2L),
+      OffWithEffect(64L),
+      OnWithRecallGlobalScene(65L),
+      OnWithTimedOff(66L),
       ;
       private final long id;
 
@@ -860,6 +1160,55 @@ public static Command value(long id) throws NoSuchFieldError {
       }
     }
 
+    public enum OffWithEffectCommandField {
+      EffectIdentifier(0),
+      EffectVariant(1),
+      ;
+      private final int id;
+
+      OffWithEffectCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static OffWithEffectCommandField value(int id) throws NoSuchFieldError {
+        for (OffWithEffectCommandField field : OffWithEffectCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum OnWithTimedOffCommandField {
+      OnOffControl(0),
+      OnTime(1),
+      OffWaitTime(2),
+      ;
+      private final int id;
+
+      OnWithTimedOffCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static OnWithTimedOffCommandField value(int id) throws NoSuchFieldError {
+        for (OnWithTimedOffCommandField field : OnWithTimedOffCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
     @Override
     public String getAttributeName(long id) throws NoSuchFieldError {
       return Attribute.value(id).toString();
@@ -891,28 +1240,16 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class LevelControl implements BaseCluster {
-    public static final long ID = 8L;
+  public static class OnOffSwitchConfiguration implements BaseCluster {
+    public static final long ID = 7L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      CurrentLevel(0L),
-      RemainingTime(1L),
-      MinLevel(2L),
-      MaxLevel(3L),
-      CurrentFrequency(4L),
-      MinFrequency(5L),
-      MaxFrequency(6L),
-      Options(15L),
-      OnOffTransitionTime(16L),
-      OnLevel(17L),
-      OnTransitionTime(18L),
-      OffTransitionTime(19L),
-      DefaultMoveRate(20L),
-      StartUpCurrentLevel(16384L),
+      SwitchType(0L),
+      SwitchActions(16L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -963,15 +1300,6 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
-      MoveToLevel(0L),
-      Move(1L),
-      Step(2L),
-      Stop(3L),
-      MoveToLevelWithOnOff(4L),
-      MoveWithOnOff(5L),
-      StepWithOnOff(6L),
-      StopWithOnOff(7L),
-      MoveToClosestFrequency(8L),
       ;
       private final long id;
 
@@ -1024,23 +1352,28 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class BinaryInputBasic implements BaseCluster {
-    public static final long ID = 15L;
+  public static class LevelControl implements BaseCluster {
+    public static final long ID = 8L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      ActiveText(4L),
-      Description(28L),
-      InactiveText(46L),
-      OutOfService(81L),
-      Polarity(84L),
-      PresentValue(85L),
-      Reliability(103L),
-      StatusFlags(111L),
-      ApplicationType(256L),
+      CurrentLevel(0L),
+      RemainingTime(1L),
+      MinLevel(2L),
+      MaxLevel(3L),
+      CurrentFrequency(4L),
+      MinFrequency(5L),
+      MaxFrequency(6L),
+      Options(15L),
+      OnOffTransitionTime(16L),
+      OnLevel(17L),
+      OnTransitionTime(18L),
+      OffTransitionTime(19L),
+      DefaultMoveRate(20L),
+      StartUpCurrentLevel(16384L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -1091,6 +1424,15 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
+      MoveToLevel(0L),
+      Move(1L),
+      Step(2L),
+      Stop(3L),
+      MoveToLevelWithOnOff(4L),
+      MoveWithOnOff(5L),
+      StepWithOnOff(6L),
+      StopWithOnOff(7L),
+      MoveToClosestFrequency(8L),
       ;
       private final long id;
 
@@ -1112,6 +1454,236 @@ public static Command value(long id) throws NoSuchFieldError {
       }
     }
 
+    public enum MoveToLevelCommandField {
+      Level(0),
+      TransitionTime(1),
+      OptionsMask(2),
+      OptionsOverride(3),
+      ;
+      private final int id;
+
+      MoveToLevelCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static MoveToLevelCommandField value(int id) throws NoSuchFieldError {
+        for (MoveToLevelCommandField field : MoveToLevelCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum MoveCommandField {
+      MoveMode(0),
+      Rate(1),
+      OptionsMask(2),
+      OptionsOverride(3),
+      ;
+      private final int id;
+
+      MoveCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static MoveCommandField value(int id) throws NoSuchFieldError {
+        for (MoveCommandField field : MoveCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum StepCommandField {
+      StepMode(0),
+      StepSize(1),
+      TransitionTime(2),
+      OptionsMask(3),
+      OptionsOverride(4),
+      ;
+      private final int id;
+
+      StepCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static StepCommandField value(int id) throws NoSuchFieldError {
+        for (StepCommandField field : StepCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum StopCommandField {
+      OptionsMask(0),
+      OptionsOverride(1),
+      ;
+      private final int id;
+
+      StopCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static StopCommandField value(int id) throws NoSuchFieldError {
+        for (StopCommandField field : StopCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum MoveToLevelWithOnOffCommandField {
+      Level(0),
+      TransitionTime(1),
+      OptionsMask(2),
+      OptionsOverride(3),
+      ;
+      private final int id;
+
+      MoveToLevelWithOnOffCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static MoveToLevelWithOnOffCommandField value(int id) throws NoSuchFieldError {
+        for (MoveToLevelWithOnOffCommandField field : MoveToLevelWithOnOffCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum MoveWithOnOffCommandField {
+      MoveMode(0),
+      Rate(1),
+      OptionsMask(2),
+      OptionsOverride(3),
+      ;
+      private final int id;
+
+      MoveWithOnOffCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static MoveWithOnOffCommandField value(int id) throws NoSuchFieldError {
+        for (MoveWithOnOffCommandField field : MoveWithOnOffCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum StepWithOnOffCommandField {
+      StepMode(0),
+      StepSize(1),
+      TransitionTime(2),
+      OptionsMask(3),
+      OptionsOverride(4),
+      ;
+      private final int id;
+
+      StepWithOnOffCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static StepWithOnOffCommandField value(int id) throws NoSuchFieldError {
+        for (StepWithOnOffCommandField field : StepWithOnOffCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum StopWithOnOffCommandField {
+      OptionsMask(0),
+      OptionsOverride(1),
+      ;
+      private final int id;
+
+      StopWithOnOffCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static StopWithOnOffCommandField value(int id) throws NoSuchFieldError {
+        for (StopWithOnOffCommandField field : StopWithOnOffCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum MoveToClosestFrequencyCommandField {
+      Frequency(0),
+      ;
+      private final int id;
+
+      MoveToClosestFrequencyCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static MoveToClosestFrequencyCommandField value(int id) throws NoSuchFieldError {
+        for (MoveToClosestFrequencyCommandField field :
+            MoveToClosestFrequencyCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
     @Override
     public String getAttributeName(long id) throws NoSuchFieldError {
       return Attribute.value(id).toString();
@@ -1143,14 +1715,23 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class PulseWidthModulation implements BaseCluster {
-    public static final long ID = 28L;
+  public static class BinaryInputBasic implements BaseCluster {
+    public static final long ID = 15L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
+      ActiveText(4L),
+      Description(28L),
+      InactiveText(46L),
+      OutOfService(81L),
+      Polarity(84L),
+      PresentValue(85L),
+      Reliability(103L),
+      StatusFlags(111L),
+      ApplicationType(256L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -1253,18 +1834,14 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class Descriptor implements BaseCluster {
-    public static final long ID = 29L;
+  public static class PulseWidthModulation implements BaseCluster {
+    public static final long ID = 28L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      DeviceTypeList(0L),
-      ServerList(1L),
-      ClientList(2L),
-      PartsList(3L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -1367,15 +1944,18 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class Binding implements BaseCluster {
-    public static final long ID = 30L;
+  public static class Descriptor implements BaseCluster {
+    public static final long ID = 29L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      Binding(0L),
+      DeviceTypeList(0L),
+      ServerList(1L),
+      ClientList(2L),
+      PartsList(3L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -1478,19 +2058,15 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class AccessControl implements BaseCluster {
-    public static final long ID = 31L;
+  public static class Binding implements BaseCluster {
+    public static final long ID = 30L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      Acl(0L),
-      Extension(1L),
-      SubjectsPerAccessControlEntry(2L),
-      TargetsPerAccessControlEntry(3L),
-      AccessControlEntriesPerFabric(4L),
+      Binding(0L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -1519,8 +2095,6 @@ public static Attribute value(long id) throws NoSuchFieldError {
     }
 
     public enum Event {
-      AccessControlEntryChanged(0L),
-      AccessControlExtensionChanged(1L),
       ;
       private final long id;
 
@@ -1595,17 +2169,19 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class Actions implements BaseCluster {
-    public static final long ID = 37L;
+  public static class AccessControl implements BaseCluster {
+    public static final long ID = 31L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      ActionList(0L),
-      EndpointLists(1L),
-      SetupURL(2L),
+      Acl(0L),
+      Extension(1L),
+      SubjectsPerAccessControlEntry(2L),
+      TargetsPerAccessControlEntry(3L),
+      AccessControlEntriesPerFabric(4L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -1634,8 +2210,8 @@ public static Attribute value(long id) throws NoSuchFieldError {
     }
 
     public enum Event {
-      StateChanged(0L),
-      ActionFailed(1L),
+      AccessControlEntryChanged(0L),
+      AccessControlExtensionChanged(1L),
       ;
       private final long id;
 
@@ -1658,18 +2234,6 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
-      InstantAction(0L),
-      InstantActionWithTransition(1L),
-      StartAction(2L),
-      StartActionWithDuration(3L),
-      StopAction(4L),
-      PauseAction(5L),
-      PauseActionWithDuration(6L),
-      ResumeAction(7L),
-      EnableAction(8L),
-      EnableActionWithDuration(9L),
-      DisableAction(10L),
-      DisableActionWithDuration(11L),
       ;
       private final long id;
 
@@ -1722,35 +2286,17 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class BasicInformation implements BaseCluster {
-    public static final long ID = 40L;
+  public static class Actions implements BaseCluster {
+    public static final long ID = 37L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      DataModelRevision(0L),
-      VendorName(1L),
-      VendorID(2L),
-      ProductName(3L),
-      ProductID(4L),
-      NodeLabel(5L),
-      Location(6L),
-      HardwareVersion(7L),
-      HardwareVersionString(8L),
-      SoftwareVersion(9L),
-      SoftwareVersionString(10L),
-      ManufacturingDate(11L),
-      PartNumber(12L),
-      ProductURL(13L),
-      ProductLabel(14L),
-      SerialNumber(15L),
-      LocalConfigDisabled(16L),
-      Reachable(17L),
-      UniqueID(18L),
-      CapabilityMinima(19L),
-      ProductAppearance(20L),
+      ActionList(0L),
+      EndpointLists(1L),
+      SetupURL(2L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -1779,10 +2325,8 @@ public static Attribute value(long id) throws NoSuchFieldError {
     }
 
     public enum Event {
-      StartUp(0L),
-      ShutDown(1L),
-      Leave(2L),
-      ReachableChanged(3L),
+      StateChanged(0L),
+      ActionFailed(1L),
       ;
       private final long id;
 
@@ -1805,7 +2349,18 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
-      MfgSpecificPing(0L),
+      InstantAction(0L),
+      InstantActionWithTransition(1L),
+      StartAction(2L),
+      StartActionWithDuration(3L),
+      StopAction(4L),
+      PauseAction(5L),
+      PauseActionWithDuration(6L),
+      ResumeAction(7L),
+      EnableAction(8L),
+      EnableActionWithDuration(9L),
+      DisableAction(10L),
+      DisableActionWithDuration(11L),
       ;
       private final long id;
 
@@ -1827,244 +2382,311 @@ public static Command value(long id) throws NoSuchFieldError {
       }
     }
 
-    @Override
-    public String getAttributeName(long id) throws NoSuchFieldError {
-      return Attribute.value(id).toString();
-    }
+    public enum InstantActionCommandField {
+      ActionID(0),
+      InvokeID(1),
+      ;
+      private final int id;
 
-    @Override
-    public String getEventName(long id) throws NoSuchFieldError {
-      return Event.value(id).toString();
-    }
+      InstantActionCommandField(int id) {
+        this.id = id;
+      }
 
-    @Override
-    public String getCommandName(long id) throws NoSuchFieldError {
-      return Command.value(id).toString();
-    }
+      public int getID() {
+        return id;
+      }
 
-    @Override
-    public long getAttributeID(String name) throws IllegalArgumentException {
-      return Attribute.valueOf(name).getID();
+      public static InstantActionCommandField value(int id) throws NoSuchFieldError {
+        for (InstantActionCommandField field : InstantActionCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
     }
 
-    @Override
-    public long getEventID(String name) throws IllegalArgumentException {
-      return Event.valueOf(name).getID();
-    }
+    public enum InstantActionWithTransitionCommandField {
+      ActionID(0),
+      InvokeID(1),
+      TransitionTime(2),
+      ;
+      private final int id;
 
-    @Override
-    public long getCommandID(String name) throws IllegalArgumentException {
-      return Command.valueOf(name).getID();
-    }
-  }
+      InstantActionWithTransitionCommandField(int id) {
+        this.id = id;
+      }
 
-  public static class OtaSoftwareUpdateProvider implements BaseCluster {
-    public static final long ID = 41L;
+      public int getID() {
+        return id;
+      }
 
-    public long getID() {
-      return ID;
+      public static InstantActionWithTransitionCommandField value(int id) throws NoSuchFieldError {
+        for (InstantActionWithTransitionCommandField field :
+            InstantActionWithTransitionCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
     }
 
-    public enum Attribute {
-      GeneratedCommandList(65528L),
-      AcceptedCommandList(65529L),
-      EventList(65530L),
-      AttributeList(65531L),
-      FeatureMap(65532L),
-      ClusterRevision(65533L),
+    public enum StartActionCommandField {
+      ActionID(0),
+      InvokeID(1),
       ;
-      private final long id;
+      private final int id;
 
-      Attribute(long id) {
+      StartActionCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Attribute value(long id) throws NoSuchFieldError {
-        for (Attribute attribute : Attribute.values()) {
-          if (attribute.getID() == id) {
-            return attribute;
+      public static StartActionCommandField value(int id) throws NoSuchFieldError {
+        for (StartActionCommandField field : StartActionCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
       }
     }
 
-    public enum Event {
+    public enum StartActionWithDurationCommandField {
+      ActionID(0),
+      InvokeID(1),
+      Duration(2),
       ;
-      private final long id;
+      private final int id;
 
-      Event(long id) {
+      StartActionWithDurationCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Event value(long id) throws NoSuchFieldError {
-        for (Event event : Event.values()) {
-          if (event.getID() == id) {
-            return event;
+      public static StartActionWithDurationCommandField value(int id) throws NoSuchFieldError {
+        for (StartActionWithDurationCommandField field :
+            StartActionWithDurationCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
       }
     }
 
-    public enum Command {
-      QueryImage(0L),
-      ApplyUpdateRequest(2L),
-      NotifyUpdateApplied(4L),
+    public enum StopActionCommandField {
+      ActionID(0),
+      InvokeID(1),
       ;
-      private final long id;
+      private final int id;
 
-      Command(long id) {
+      StopActionCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Command value(long id) throws NoSuchFieldError {
-        for (Command command : Command.values()) {
-          if (command.getID() == id) {
-            return command;
+      public static StopActionCommandField value(int id) throws NoSuchFieldError {
+        for (StopActionCommandField field : StopActionCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
       }
     }
 
-    @Override
-    public String getAttributeName(long id) throws NoSuchFieldError {
-      return Attribute.value(id).toString();
-    }
+    public enum PauseActionCommandField {
+      ActionID(0),
+      InvokeID(1),
+      ;
+      private final int id;
 
-    @Override
-    public String getEventName(long id) throws NoSuchFieldError {
-      return Event.value(id).toString();
-    }
+      PauseActionCommandField(int id) {
+        this.id = id;
+      }
 
-    @Override
-    public String getCommandName(long id) throws NoSuchFieldError {
-      return Command.value(id).toString();
-    }
+      public int getID() {
+        return id;
+      }
 
-    @Override
-    public long getAttributeID(String name) throws IllegalArgumentException {
-      return Attribute.valueOf(name).getID();
+      public static PauseActionCommandField value(int id) throws NoSuchFieldError {
+        for (PauseActionCommandField field : PauseActionCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
     }
 
-    @Override
-    public long getEventID(String name) throws IllegalArgumentException {
-      return Event.valueOf(name).getID();
-    }
+    public enum PauseActionWithDurationCommandField {
+      ActionID(0),
+      InvokeID(1),
+      Duration(2),
+      ;
+      private final int id;
 
-    @Override
-    public long getCommandID(String name) throws IllegalArgumentException {
-      return Command.valueOf(name).getID();
-    }
-  }
+      PauseActionWithDurationCommandField(int id) {
+        this.id = id;
+      }
 
-  public static class OtaSoftwareUpdateRequestor implements BaseCluster {
-    public static final long ID = 42L;
+      public int getID() {
+        return id;
+      }
 
-    public long getID() {
-      return ID;
+      public static PauseActionWithDurationCommandField value(int id) throws NoSuchFieldError {
+        for (PauseActionWithDurationCommandField field :
+            PauseActionWithDurationCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
     }
 
-    public enum Attribute {
-      DefaultOTAProviders(0L),
-      UpdatePossible(1L),
-      UpdateState(2L),
-      UpdateStateProgress(3L),
-      GeneratedCommandList(65528L),
-      AcceptedCommandList(65529L),
-      EventList(65530L),
-      AttributeList(65531L),
-      FeatureMap(65532L),
-      ClusterRevision(65533L),
+    public enum ResumeActionCommandField {
+      ActionID(0),
+      InvokeID(1),
       ;
-      private final long id;
+      private final int id;
 
-      Attribute(long id) {
+      ResumeActionCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Attribute value(long id) throws NoSuchFieldError {
-        for (Attribute attribute : Attribute.values()) {
-          if (attribute.getID() == id) {
-            return attribute;
+      public static ResumeActionCommandField value(int id) throws NoSuchFieldError {
+        for (ResumeActionCommandField field : ResumeActionCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
       }
     }
 
-    public enum Event {
-      StateTransition(0L),
-      VersionApplied(1L),
-      DownloadError(2L),
+    public enum EnableActionCommandField {
+      ActionID(0),
+      InvokeID(1),
       ;
-      private final long id;
+      private final int id;
 
-      Event(long id) {
+      EnableActionCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Event value(long id) throws NoSuchFieldError {
-        for (Event event : Event.values()) {
-          if (event.getID() == id) {
-            return event;
+      public static EnableActionCommandField value(int id) throws NoSuchFieldError {
+        for (EnableActionCommandField field : EnableActionCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
       }
     }
 
-    public enum Command {
-      AnnounceOTAProvider(0L),
+    public enum EnableActionWithDurationCommandField {
+      ActionID(0),
+      InvokeID(1),
+      Duration(2),
       ;
-      private final long id;
+      private final int id;
 
-      Command(long id) {
+      EnableActionWithDurationCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Command value(long id) throws NoSuchFieldError {
-        for (Command command : Command.values()) {
-          if (command.getID() == id) {
-            return command;
+      public static EnableActionWithDurationCommandField value(int id) throws NoSuchFieldError {
+        for (EnableActionWithDurationCommandField field :
+            EnableActionWithDurationCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
       }
     }
 
-    @Override
-    public String getAttributeName(long id) throws NoSuchFieldError {
-      return Attribute.value(id).toString();
-    }
+    public enum DisableActionCommandField {
+      ActionID(0),
+      InvokeID(1),
+      ;
+      private final int id;
 
-    @Override
-    public String getEventName(long id) throws NoSuchFieldError {
+      DisableActionCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static DisableActionCommandField value(int id) throws NoSuchFieldError {
+        for (DisableActionCommandField field : DisableActionCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum DisableActionWithDurationCommandField {
+      ActionID(0),
+      InvokeID(1),
+      Duration(2),
+      ;
+      private final int id;
+
+      DisableActionWithDurationCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static DisableActionWithDurationCommandField value(int id) throws NoSuchFieldError {
+        for (DisableActionWithDurationCommandField field :
+            DisableActionWithDurationCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    @Override
+    public String getAttributeName(long id) throws NoSuchFieldError {
+      return Attribute.value(id).toString();
+    }
+
+    @Override
+    public String getEventName(long id) throws NoSuchFieldError {
       return Event.value(id).toString();
     }
 
@@ -2089,16 +2711,35 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class LocalizationConfiguration implements BaseCluster {
-    public static final long ID = 43L;
+  public static class BasicInformation implements BaseCluster {
+    public static final long ID = 40L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      ActiveLocale(0L),
-      SupportedLocales(1L),
+      DataModelRevision(0L),
+      VendorName(1L),
+      VendorID(2L),
+      ProductName(3L),
+      ProductID(4L),
+      NodeLabel(5L),
+      Location(6L),
+      HardwareVersion(7L),
+      HardwareVersionString(8L),
+      SoftwareVersion(9L),
+      SoftwareVersionString(10L),
+      ManufacturingDate(11L),
+      PartNumber(12L),
+      ProductURL(13L),
+      ProductLabel(14L),
+      SerialNumber(15L),
+      LocalConfigDisabled(16L),
+      Reachable(17L),
+      UniqueID(18L),
+      CapabilityMinima(19L),
+      ProductAppearance(20L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -2127,6 +2768,10 @@ public static Attribute value(long id) throws NoSuchFieldError {
     }
 
     public enum Event {
+      StartUp(0L),
+      ShutDown(1L),
+      Leave(2L),
+      ReachableChanged(3L),
       ;
       private final long id;
 
@@ -2149,6 +2794,7 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
+      MfgSpecificPing(0L),
       ;
       private final long id;
 
@@ -2201,17 +2847,14 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class TimeFormatLocalization implements BaseCluster {
-    public static final long ID = 44L;
+  public static class OtaSoftwareUpdateProvider implements BaseCluster {
+    public static final long ID = 41L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      HourFormat(0L),
-      ActiveCalendarType(1L),
-      SupportedCalendarTypes(2L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -2262,6 +2905,9 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
+      QueryImage(0L),
+      ApplyUpdateRequest(2L),
+      NotifyUpdateApplied(4L),
       ;
       private final long id;
 
@@ -2283,111 +2929,78 @@ public static Command value(long id) throws NoSuchFieldError {
       }
     }
 
-    @Override
-    public String getAttributeName(long id) throws NoSuchFieldError {
-      return Attribute.value(id).toString();
-    }
-
-    @Override
-    public String getEventName(long id) throws NoSuchFieldError {
-      return Event.value(id).toString();
-    }
-
-    @Override
-    public String getCommandName(long id) throws NoSuchFieldError {
-      return Command.value(id).toString();
-    }
-
-    @Override
-    public long getAttributeID(String name) throws IllegalArgumentException {
-      return Attribute.valueOf(name).getID();
-    }
-
-    @Override
-    public long getEventID(String name) throws IllegalArgumentException {
-      return Event.valueOf(name).getID();
-    }
-
-    @Override
-    public long getCommandID(String name) throws IllegalArgumentException {
-      return Command.valueOf(name).getID();
-    }
-  }
-
-  public static class UnitLocalization implements BaseCluster {
-    public static final long ID = 45L;
-
-    public long getID() {
-      return ID;
-    }
-
-    public enum Attribute {
-      TemperatureUnit(0L),
-      GeneratedCommandList(65528L),
-      AcceptedCommandList(65529L),
-      EventList(65530L),
-      AttributeList(65531L),
-      FeatureMap(65532L),
-      ClusterRevision(65533L),
+    public enum QueryImageCommandField {
+      VendorID(0),
+      ProductID(1),
+      SoftwareVersion(2),
+      ProtocolsSupported(3),
+      HardwareVersion(4),
+      Location(5),
+      RequestorCanConsent(6),
+      MetadataForProvider(7),
       ;
-      private final long id;
+      private final int id;
 
-      Attribute(long id) {
+      QueryImageCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Attribute value(long id) throws NoSuchFieldError {
-        for (Attribute attribute : Attribute.values()) {
-          if (attribute.getID() == id) {
-            return attribute;
+      public static QueryImageCommandField value(int id) throws NoSuchFieldError {
+        for (QueryImageCommandField field : QueryImageCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
       }
     }
 
-    public enum Event {
+    public enum ApplyUpdateRequestCommandField {
+      UpdateToken(0),
+      NewVersion(1),
       ;
-      private final long id;
+      private final int id;
 
-      Event(long id) {
+      ApplyUpdateRequestCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Event value(long id) throws NoSuchFieldError {
-        for (Event event : Event.values()) {
-          if (event.getID() == id) {
-            return event;
+      public static ApplyUpdateRequestCommandField value(int id) throws NoSuchFieldError {
+        for (ApplyUpdateRequestCommandField field : ApplyUpdateRequestCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
       }
     }
 
-    public enum Command {
+    public enum NotifyUpdateAppliedCommandField {
+      UpdateToken(0),
+      SoftwareVersion(1),
       ;
-      private final long id;
+      private final int id;
 
-      Command(long id) {
+      NotifyUpdateAppliedCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Command value(long id) throws NoSuchFieldError {
-        for (Command command : Command.values()) {
-          if (command.getID() == id) {
-            return command;
+      public static NotifyUpdateAppliedCommandField value(int id) throws NoSuchFieldError {
+        for (NotifyUpdateAppliedCommandField field : NotifyUpdateAppliedCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
@@ -2425,15 +3038,18 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class PowerSourceConfiguration implements BaseCluster {
-    public static final long ID = 46L;
+  public static class OtaSoftwareUpdateRequestor implements BaseCluster {
+    public static final long ID = 42L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      Sources(0L),
+      DefaultOTAProviders(0L),
+      UpdatePossible(1L),
+      UpdateState(2L),
+      UpdateStateProgress(3L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -2462,6 +3078,9 @@ public static Attribute value(long id) throws NoSuchFieldError {
     }
 
     public enum Event {
+      StateTransition(0L),
+      VersionApplied(1L),
+      DownloadError(2L),
       ;
       private final long id;
 
@@ -2484,6 +3103,7 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
+      AnnounceOTAProvider(0L),
       ;
       private final long id;
 
@@ -2505,6 +3125,33 @@ public static Command value(long id) throws NoSuchFieldError {
       }
     }
 
+    public enum AnnounceOTAProviderCommandField {
+      ProviderNodeID(0),
+      VendorID(1),
+      AnnouncementReason(2),
+      MetadataForNode(3),
+      Endpoint(4),
+      ;
+      private final int id;
+
+      AnnounceOTAProviderCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static AnnounceOTAProviderCommandField value(int id) throws NoSuchFieldError {
+        for (AnnounceOTAProviderCommandField field : AnnounceOTAProviderCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
     @Override
     public String getAttributeName(long id) throws NoSuchFieldError {
       return Attribute.value(id).toString();
@@ -2536,45 +3183,16 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class PowerSource implements BaseCluster {
-    public static final long ID = 47L;
+  public static class LocalizationConfiguration implements BaseCluster {
+    public static final long ID = 43L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      Status(0L),
-      Order(1L),
-      Description(2L),
-      WiredAssessedInputVoltage(3L),
-      WiredAssessedInputFrequency(4L),
-      WiredCurrentType(5L),
-      WiredAssessedCurrent(6L),
-      WiredNominalVoltage(7L),
-      WiredMaximumCurrent(8L),
-      WiredPresent(9L),
-      ActiveWiredFaults(10L),
-      BatVoltage(11L),
-      BatPercentRemaining(12L),
-      BatTimeRemaining(13L),
-      BatChargeLevel(14L),
-      BatReplacementNeeded(15L),
-      BatReplaceability(16L),
-      BatPresent(17L),
-      ActiveBatFaults(18L),
-      BatReplacementDescription(19L),
-      BatCommonDesignation(20L),
-      BatANSIDesignation(21L),
-      BatIECDesignation(22L),
-      BatApprovedChemistry(23L),
-      BatCapacity(24L),
-      BatQuantity(25L),
-      BatChargeState(26L),
-      BatTimeToFullCharge(27L),
-      BatFunctionalWhileCharging(28L),
-      BatChargingCurrent(29L),
-      ActiveBatChargeFaults(30L),
+      ActiveLocale(0L),
+      SupportedLocales(1L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -2603,9 +3221,6 @@ public static Attribute value(long id) throws NoSuchFieldError {
     }
 
     public enum Event {
-      WiredFaultChange(0L),
-      BatFaultChange(1L),
-      BatChargeFaultChange(2L),
       ;
       private final long id;
 
@@ -2680,19 +3295,17 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class GeneralCommissioning implements BaseCluster {
-    public static final long ID = 48L;
+  public static class TimeFormatLocalization implements BaseCluster {
+    public static final long ID = 44L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      Breadcrumb(0L),
-      BasicCommissioningInfo(1L),
-      RegulatoryConfig(2L),
-      LocationCapability(3L),
-      SupportsConcurrentConnection(4L),
+      HourFormat(0L),
+      ActiveCalendarType(1L),
+      SupportedCalendarTypes(2L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -2743,9 +3356,6 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
-      ArmFailSafe(0L),
-      SetRegulatoryConfig(2L),
-      CommissioningComplete(4L),
       ;
       private final long id;
 
@@ -2798,22 +3408,15 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class NetworkCommissioning implements BaseCluster {
-    public static final long ID = 49L;
+  public static class UnitLocalization implements BaseCluster {
+    public static final long ID = 45L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      MaxNetworks(0L),
-      Networks(1L),
-      ScanMaxTimeSeconds(2L),
-      ConnectMaxTimeSeconds(3L),
-      InterfaceEnabled(4L),
-      LastNetworkingStatus(5L),
-      LastNetworkID(6L),
-      LastConnectErrorValue(7L),
+      TemperatureUnit(0L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -2864,12 +3467,6 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
-      ScanNetworks(0L),
-      AddOrUpdateWiFiNetwork(2L),
-      AddOrUpdateThreadNetwork(3L),
-      RemoveNetwork(4L),
-      ConnectNetwork(6L),
-      ReorderNetwork(8L),
       ;
       private final long id;
 
@@ -2922,14 +3519,15 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class DiagnosticLogs implements BaseCluster {
-    public static final long ID = 50L;
+  public static class PowerSourceConfiguration implements BaseCluster {
+    public static final long ID = 46L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
+      Sources(0L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -2980,7 +3578,6 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
-      RetrieveLogsRequest(0L),
       ;
       private final long id;
 
@@ -3033,23 +3630,45 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class GeneralDiagnostics implements BaseCluster {
-    public static final long ID = 51L;
+  public static class PowerSource implements BaseCluster {
+    public static final long ID = 47L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      NetworkInterfaces(0L),
-      RebootCount(1L),
-      UpTime(2L),
-      TotalOperationalHours(3L),
-      BootReason(4L),
-      ActiveHardwareFaults(5L),
-      ActiveRadioFaults(6L),
-      ActiveNetworkFaults(7L),
-      TestEventTriggersEnabled(8L),
+      Status(0L),
+      Order(1L),
+      Description(2L),
+      WiredAssessedInputVoltage(3L),
+      WiredAssessedInputFrequency(4L),
+      WiredCurrentType(5L),
+      WiredAssessedCurrent(6L),
+      WiredNominalVoltage(7L),
+      WiredMaximumCurrent(8L),
+      WiredPresent(9L),
+      ActiveWiredFaults(10L),
+      BatVoltage(11L),
+      BatPercentRemaining(12L),
+      BatTimeRemaining(13L),
+      BatChargeLevel(14L),
+      BatReplacementNeeded(15L),
+      BatReplaceability(16L),
+      BatPresent(17L),
+      ActiveBatFaults(18L),
+      BatReplacementDescription(19L),
+      BatCommonDesignation(20L),
+      BatANSIDesignation(21L),
+      BatIECDesignation(22L),
+      BatApprovedChemistry(23L),
+      BatCapacity(24L),
+      BatQuantity(25L),
+      BatChargeState(26L),
+      BatTimeToFullCharge(27L),
+      BatFunctionalWhileCharging(28L),
+      BatChargingCurrent(29L),
+      ActiveBatChargeFaults(30L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -3078,10 +3697,9 @@ public static Attribute value(long id) throws NoSuchFieldError {
     }
 
     public enum Event {
-      HardwareFaultChange(0L),
-      RadioFaultChange(1L),
-      NetworkFaultChange(2L),
-      BootReason(3L),
+      WiredFaultChange(0L),
+      BatFaultChange(1L),
+      BatChargeFaultChange(2L),
       ;
       private final long id;
 
@@ -3104,7 +3722,6 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
-      TestEventTrigger(0L),
       ;
       private final long id;
 
@@ -3157,18 +3774,19 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class SoftwareDiagnostics implements BaseCluster {
-    public static final long ID = 52L;
+  public static class GeneralCommissioning implements BaseCluster {
+    public static final long ID = 48L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      ThreadMetrics(0L),
-      CurrentHeapFree(1L),
-      CurrentHeapUsed(2L),
-      CurrentHeapHighWatermark(3L),
+      Breadcrumb(0L),
+      BasicCommissioningInfo(1L),
+      RegulatoryConfig(2L),
+      LocationCapability(3L),
+      SupportsConcurrentConnection(4L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -3197,7 +3815,6 @@ public static Attribute value(long id) throws NoSuchFieldError {
     }
 
     public enum Event {
-      SoftwareFault(0L),
       ;
       private final long id;
 
@@ -3220,7 +3837,9 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
-      ResetWatermarks(0L),
+      ArmFailSafe(0L),
+      SetRegulatoryConfig(2L),
+      CommissioningComplete(4L),
       ;
       private final long id;
 
@@ -3242,6 +3861,55 @@ public static Command value(long id) throws NoSuchFieldError {
       }
     }
 
+    public enum ArmFailSafeCommandField {
+      ExpiryLengthSeconds(0),
+      Breadcrumb(1),
+      ;
+      private final int id;
+
+      ArmFailSafeCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static ArmFailSafeCommandField value(int id) throws NoSuchFieldError {
+        for (ArmFailSafeCommandField field : ArmFailSafeCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum SetRegulatoryConfigCommandField {
+      NewRegulatoryConfig(0),
+      CountryCode(1),
+      Breadcrumb(2),
+      ;
+      private final int id;
+
+      SetRegulatoryConfigCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static SetRegulatoryConfigCommandField value(int id) throws NoSuchFieldError {
+        for (SetRegulatoryConfigCommandField field : SetRegulatoryConfigCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
     @Override
     public String getAttributeName(long id) throws NoSuchFieldError {
       return Attribute.value(id).toString();
@@ -3273,77 +3941,22 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class ThreadNetworkDiagnostics implements BaseCluster {
-    public static final long ID = 53L;
+  public static class NetworkCommissioning implements BaseCluster {
+    public static final long ID = 49L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      Channel(0L),
-      RoutingRole(1L),
-      NetworkName(2L),
-      PanId(3L),
-      ExtendedPanId(4L),
-      MeshLocalPrefix(5L),
-      OverrunCount(6L),
-      NeighborTable(7L),
-      RouteTable(8L),
-      PartitionId(9L),
-      Weighting(10L),
-      DataVersion(11L),
-      StableDataVersion(12L),
-      LeaderRouterId(13L),
-      DetachedRoleCount(14L),
-      ChildRoleCount(15L),
-      RouterRoleCount(16L),
-      LeaderRoleCount(17L),
-      AttachAttemptCount(18L),
-      PartitionIdChangeCount(19L),
-      BetterPartitionAttachAttemptCount(20L),
-      ParentChangeCount(21L),
-      TxTotalCount(22L),
-      TxUnicastCount(23L),
-      TxBroadcastCount(24L),
-      TxAckRequestedCount(25L),
-      TxAckedCount(26L),
-      TxNoAckRequestedCount(27L),
-      TxDataCount(28L),
-      TxDataPollCount(29L),
-      TxBeaconCount(30L),
-      TxBeaconRequestCount(31L),
-      TxOtherCount(32L),
-      TxRetryCount(33L),
-      TxDirectMaxRetryExpiryCount(34L),
-      TxIndirectMaxRetryExpiryCount(35L),
-      TxErrCcaCount(36L),
-      TxErrAbortCount(37L),
-      TxErrBusyChannelCount(38L),
-      RxTotalCount(39L),
-      RxUnicastCount(40L),
-      RxBroadcastCount(41L),
-      RxDataCount(42L),
-      RxDataPollCount(43L),
-      RxBeaconCount(44L),
-      RxBeaconRequestCount(45L),
-      RxOtherCount(46L),
-      RxAddressFilteredCount(47L),
-      RxDestAddrFilteredCount(48L),
-      RxDuplicatedCount(49L),
-      RxErrNoFrameCount(50L),
-      RxErrUnknownNeighborCount(51L),
-      RxErrInvalidSrcAddrCount(52L),
-      RxErrSecCount(53L),
-      RxErrFcsCount(54L),
-      RxErrOtherCount(55L),
-      ActiveTimestamp(56L),
-      PendingTimestamp(57L),
-      Delay(58L),
-      SecurityPolicy(59L),
-      ChannelPage0Mask(60L),
-      OperationalDatasetComponents(61L),
-      ActiveNetworkFaultsList(62L),
+      MaxNetworks(0L),
+      Networks(1L),
+      ScanMaxTimeSeconds(2L),
+      ConnectMaxTimeSeconds(3L),
+      InterfaceEnabled(4L),
+      LastNetworkingStatus(5L),
+      LastNetworkID(6L),
+      LastConnectErrorValue(7L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -3372,8 +3985,6 @@ public static Attribute value(long id) throws NoSuchFieldError {
     }
 
     public enum Event {
-      ConnectionStatus(0L),
-      NetworkFaultChange(1L),
       ;
       private final long id;
 
@@ -3396,7 +4007,12 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
-      ResetCounts(0L),
+      ScanNetworks(0L),
+      AddOrUpdateWiFiNetwork(2L),
+      AddOrUpdateThreadNetwork(3L),
+      RemoveNetwork(4L),
+      ConnectNetwork(6L),
+      ReorderNetwork(8L),
       ;
       private final long id;
 
@@ -3418,127 +4034,148 @@ public static Command value(long id) throws NoSuchFieldError {
       }
     }
 
-    @Override
-    public String getAttributeName(long id) throws NoSuchFieldError {
-      return Attribute.value(id).toString();
-    }
-
-    @Override
-    public String getEventName(long id) throws NoSuchFieldError {
-      return Event.value(id).toString();
-    }
-
-    @Override
-    public String getCommandName(long id) throws NoSuchFieldError {
-      return Command.value(id).toString();
-    }
-
-    @Override
-    public long getAttributeID(String name) throws IllegalArgumentException {
-      return Attribute.valueOf(name).getID();
-    }
-
-    @Override
-    public long getEventID(String name) throws IllegalArgumentException {
-      return Event.valueOf(name).getID();
-    }
-
-    @Override
-    public long getCommandID(String name) throws IllegalArgumentException {
-      return Command.valueOf(name).getID();
-    }
-  }
-
-  public static class WiFiNetworkDiagnostics implements BaseCluster {
-    public static final long ID = 54L;
-
-    public long getID() {
-      return ID;
-    }
-
-    public enum Attribute {
-      Bssid(0L),
-      SecurityType(1L),
-      WiFiVersion(2L),
-      ChannelNumber(3L),
-      Rssi(4L),
-      BeaconLostCount(5L),
-      BeaconRxCount(6L),
-      PacketMulticastRxCount(7L),
-      PacketMulticastTxCount(8L),
-      PacketUnicastRxCount(9L),
-      PacketUnicastTxCount(10L),
-      CurrentMaxRate(11L),
-      OverrunCount(12L),
-      GeneratedCommandList(65528L),
-      AcceptedCommandList(65529L),
-      EventList(65530L),
-      AttributeList(65531L),
-      FeatureMap(65532L),
-      ClusterRevision(65533L),
+    public enum ScanNetworksCommandField {
+      Ssid(0),
+      Breadcrumb(1),
       ;
-      private final long id;
+      private final int id;
 
-      Attribute(long id) {
+      ScanNetworksCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Attribute value(long id) throws NoSuchFieldError {
-        for (Attribute attribute : Attribute.values()) {
-          if (attribute.getID() == id) {
-            return attribute;
+      public static ScanNetworksCommandField value(int id) throws NoSuchFieldError {
+        for (ScanNetworksCommandField field : ScanNetworksCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
       }
     }
 
-    public enum Event {
-      Disconnection(0L),
-      AssociationFailure(1L),
-      ConnectionStatus(2L),
+    public enum AddOrUpdateWiFiNetworkCommandField {
+      Ssid(0),
+      Credentials(1),
+      Breadcrumb(2),
       ;
-      private final long id;
+      private final int id;
 
-      Event(long id) {
+      AddOrUpdateWiFiNetworkCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Event value(long id) throws NoSuchFieldError {
-        for (Event event : Event.values()) {
-          if (event.getID() == id) {
-            return event;
+      public static AddOrUpdateWiFiNetworkCommandField value(int id) throws NoSuchFieldError {
+        for (AddOrUpdateWiFiNetworkCommandField field :
+            AddOrUpdateWiFiNetworkCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
       }
     }
 
-    public enum Command {
-      ResetCounts(0L),
+    public enum AddOrUpdateThreadNetworkCommandField {
+      OperationalDataset(0),
+      Breadcrumb(1),
       ;
-      private final long id;
+      private final int id;
 
-      Command(long id) {
+      AddOrUpdateThreadNetworkCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Command value(long id) throws NoSuchFieldError {
-        for (Command command : Command.values()) {
-          if (command.getID() == id) {
-            return command;
+      public static AddOrUpdateThreadNetworkCommandField value(int id) throws NoSuchFieldError {
+        for (AddOrUpdateThreadNetworkCommandField field :
+            AddOrUpdateThreadNetworkCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum RemoveNetworkCommandField {
+      NetworkID(0),
+      Breadcrumb(1),
+      ;
+      private final int id;
+
+      RemoveNetworkCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static RemoveNetworkCommandField value(int id) throws NoSuchFieldError {
+        for (RemoveNetworkCommandField field : RemoveNetworkCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum ConnectNetworkCommandField {
+      NetworkID(0),
+      Breadcrumb(1),
+      ;
+      private final int id;
+
+      ConnectNetworkCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static ConnectNetworkCommandField value(int id) throws NoSuchFieldError {
+        for (ConnectNetworkCommandField field : ConnectNetworkCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum ReorderNetworkCommandField {
+      NetworkID(0),
+      NetworkIndex(1),
+      Breadcrumb(2),
+      ;
+      private final int id;
+
+      ReorderNetworkCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static ReorderNetworkCommandField value(int id) throws NoSuchFieldError {
+        for (ReorderNetworkCommandField field : ReorderNetworkCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
@@ -3576,23 +4213,14 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class EthernetNetworkDiagnostics implements BaseCluster {
-    public static final long ID = 55L;
+  public static class DiagnosticLogs implements BaseCluster {
+    public static final long ID = 50L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      PHYRate(0L),
-      FullDuplex(1L),
-      PacketRxCount(2L),
-      PacketTxCount(3L),
-      TxErrCount(4L),
-      CollisionCount(5L),
-      OverrunCount(6L),
-      CarrierDetect(7L),
-      TimeSinceReset(8L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -3643,7 +4271,7 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
-      ResetCounts(0L),
+      RetrieveLogsRequest(0L),
       ;
       private final long id;
 
@@ -3665,6 +4293,31 @@ public static Command value(long id) throws NoSuchFieldError {
       }
     }
 
+    public enum RetrieveLogsRequestCommandField {
+      Intent(0),
+      RequestedProtocol(1),
+      TransferFileDesignator(2),
+      ;
+      private final int id;
+
+      RetrieveLogsRequestCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static RetrieveLogsRequestCommandField value(int id) throws NoSuchFieldError {
+        for (RetrieveLogsRequestCommandField field : RetrieveLogsRequestCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
     @Override
     public String getAttributeName(long id) throws NoSuchFieldError {
       return Attribute.value(id).toString();
@@ -3696,27 +4349,23 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class TimeSynchronization implements BaseCluster {
-    public static final long ID = 56L;
+  public static class GeneralDiagnostics implements BaseCluster {
+    public static final long ID = 51L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      UTCTime(0L),
-      Granularity(1L),
-      TimeSource(2L),
-      TrustedTimeSource(3L),
-      DefaultNTP(4L),
-      TimeZone(5L),
-      DSTOffset(6L),
-      LocalTime(7L),
-      TimeZoneDatabase(8L),
-      NTPServerAvailable(9L),
-      TimeZoneListMaxSize(10L),
-      DSTOffsetListMaxSize(11L),
-      SupportsDNSResolve(12L),
+      NetworkInterfaces(0L),
+      RebootCount(1L),
+      UpTime(2L),
+      TotalOperationalHours(3L),
+      BootReason(4L),
+      ActiveHardwareFaults(5L),
+      ActiveRadioFaults(6L),
+      ActiveNetworkFaults(7L),
+      TestEventTriggersEnabled(8L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -3745,11 +4394,10 @@ public static Attribute value(long id) throws NoSuchFieldError {
     }
 
     public enum Event {
-      DSTTableEmpty(0L),
-      DSTStatus(1L),
-      TimeZoneStatus(2L),
-      TimeFailure(3L),
-      MissingTrustedTimeSource(4L),
+      HardwareFaultChange(0L),
+      RadioFaultChange(1L),
+      NetworkFaultChange(2L),
+      BootReason(3L),
       ;
       private final long id;
 
@@ -3772,11 +4420,7 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
-      SetUTCTime(0L),
-      SetTrustedTimeSource(1L),
-      SetTimeZone(2L),
-      SetDSTOffset(4L),
-      SetDefaultNTP(5L),
+      TestEventTrigger(0L),
       ;
       private final long id;
 
@@ -3798,6 +4442,30 @@ public static Command value(long id) throws NoSuchFieldError {
       }
     }
 
+    public enum TestEventTriggerCommandField {
+      EnableKey(0),
+      EventTrigger(1),
+      ;
+      private final int id;
+
+      TestEventTriggerCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static TestEventTriggerCommandField value(int id) throws NoSuchFieldError {
+        for (TestEventTriggerCommandField field : TestEventTriggerCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
     @Override
     public String getAttributeName(long id) throws NoSuchFieldError {
       return Attribute.value(id).toString();
@@ -3829,30 +4497,18 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class BridgedDeviceBasicInformation implements BaseCluster {
-    public static final long ID = 57L;
+  public static class SoftwareDiagnostics implements BaseCluster {
+    public static final long ID = 52L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      VendorName(1L),
-      VendorID(2L),
-      ProductName(3L),
-      NodeLabel(5L),
-      HardwareVersion(7L),
-      HardwareVersionString(8L),
-      SoftwareVersion(9L),
-      SoftwareVersionString(10L),
-      ManufacturingDate(11L),
-      PartNumber(12L),
-      ProductURL(13L),
-      ProductLabel(14L),
-      SerialNumber(15L),
-      Reachable(17L),
-      UniqueID(18L),
-      ProductAppearance(20L),
+      ThreadMetrics(0L),
+      CurrentHeapFree(1L),
+      CurrentHeapUsed(2L),
+      CurrentHeapHighWatermark(3L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -3881,10 +4537,7 @@ public static Attribute value(long id) throws NoSuchFieldError {
     }
 
     public enum Event {
-      StartUp(0L),
-      ShutDown(1L),
-      Leave(2L),
-      ReachableChanged(3L),
+      SoftwareFault(0L),
       ;
       private final long id;
 
@@ -3907,6 +4560,7 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
+      ResetWatermarks(0L),
       ;
       private final long id;
 
@@ -3959,17 +4613,77 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class Switch implements BaseCluster {
-    public static final long ID = 59L;
+  public static class ThreadNetworkDiagnostics implements BaseCluster {
+    public static final long ID = 53L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      NumberOfPositions(0L),
-      CurrentPosition(1L),
-      MultiPressMax(2L),
+      Channel(0L),
+      RoutingRole(1L),
+      NetworkName(2L),
+      PanId(3L),
+      ExtendedPanId(4L),
+      MeshLocalPrefix(5L),
+      OverrunCount(6L),
+      NeighborTable(7L),
+      RouteTable(8L),
+      PartitionId(9L),
+      Weighting(10L),
+      DataVersion(11L),
+      StableDataVersion(12L),
+      LeaderRouterId(13L),
+      DetachedRoleCount(14L),
+      ChildRoleCount(15L),
+      RouterRoleCount(16L),
+      LeaderRoleCount(17L),
+      AttachAttemptCount(18L),
+      PartitionIdChangeCount(19L),
+      BetterPartitionAttachAttemptCount(20L),
+      ParentChangeCount(21L),
+      TxTotalCount(22L),
+      TxUnicastCount(23L),
+      TxBroadcastCount(24L),
+      TxAckRequestedCount(25L),
+      TxAckedCount(26L),
+      TxNoAckRequestedCount(27L),
+      TxDataCount(28L),
+      TxDataPollCount(29L),
+      TxBeaconCount(30L),
+      TxBeaconRequestCount(31L),
+      TxOtherCount(32L),
+      TxRetryCount(33L),
+      TxDirectMaxRetryExpiryCount(34L),
+      TxIndirectMaxRetryExpiryCount(35L),
+      TxErrCcaCount(36L),
+      TxErrAbortCount(37L),
+      TxErrBusyChannelCount(38L),
+      RxTotalCount(39L),
+      RxUnicastCount(40L),
+      RxBroadcastCount(41L),
+      RxDataCount(42L),
+      RxDataPollCount(43L),
+      RxBeaconCount(44L),
+      RxBeaconRequestCount(45L),
+      RxOtherCount(46L),
+      RxAddressFilteredCount(47L),
+      RxDestAddrFilteredCount(48L),
+      RxDuplicatedCount(49L),
+      RxErrNoFrameCount(50L),
+      RxErrUnknownNeighborCount(51L),
+      RxErrInvalidSrcAddrCount(52L),
+      RxErrSecCount(53L),
+      RxErrFcsCount(54L),
+      RxErrOtherCount(55L),
+      ActiveTimestamp(56L),
+      PendingTimestamp(57L),
+      Delay(58L),
+      SecurityPolicy(59L),
+      ChannelPage0Mask(60L),
+      OperationalDatasetComponents(61L),
+      ActiveNetworkFaultsList(62L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -3998,13 +4712,8 @@ public static Attribute value(long id) throws NoSuchFieldError {
     }
 
     public enum Event {
-      SwitchLatched(0L),
-      InitialPress(1L),
-      LongPress(2L),
-      ShortRelease(3L),
-      LongRelease(4L),
-      MultiPressOngoing(5L),
-      MultiPressComplete(6L),
+      ConnectionStatus(0L),
+      NetworkFaultChange(1L),
       ;
       private final long id;
 
@@ -4027,6 +4736,7 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
+      ResetCounts(0L),
       ;
       private final long id;
 
@@ -4079,24 +4789,34 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class AdministratorCommissioning implements BaseCluster {
-    public static final long ID = 60L;
+  public static class WiFiNetworkDiagnostics implements BaseCluster {
+    public static final long ID = 54L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      WindowStatus(0L),
-      AdminFabricIndex(1L),
-      AdminVendorId(2L),
-      GeneratedCommandList(65528L),
-      AcceptedCommandList(65529L),
-      EventList(65530L),
-      AttributeList(65531L),
-      FeatureMap(65532L),
-      ClusterRevision(65533L),
-      ;
+      Bssid(0L),
+      SecurityType(1L),
+      WiFiVersion(2L),
+      ChannelNumber(3L),
+      Rssi(4L),
+      BeaconLostCount(5L),
+      BeaconRxCount(6L),
+      PacketMulticastRxCount(7L),
+      PacketMulticastTxCount(8L),
+      PacketUnicastRxCount(9L),
+      PacketUnicastTxCount(10L),
+      CurrentMaxRate(11L),
+      OverrunCount(12L),
+      GeneratedCommandList(65528L),
+      AcceptedCommandList(65529L),
+      EventList(65530L),
+      AttributeList(65531L),
+      FeatureMap(65532L),
+      ClusterRevision(65533L),
+      ;
       private final long id;
 
       Attribute(long id) {
@@ -4118,6 +4838,9 @@ public static Attribute value(long id) throws NoSuchFieldError {
     }
 
     public enum Event {
+      Disconnection(0L),
+      AssociationFailure(1L),
+      ConnectionStatus(2L),
       ;
       private final long id;
 
@@ -4140,9 +4863,7 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
-      OpenCommissioningWindow(0L),
-      OpenBasicCommissioningWindow(1L),
-      RevokeCommissioning(2L),
+      ResetCounts(0L),
       ;
       private final long id;
 
@@ -4195,20 +4916,23 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class OperationalCredentials implements BaseCluster {
-    public static final long ID = 62L;
+  public static class EthernetNetworkDiagnostics implements BaseCluster {
+    public static final long ID = 55L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      NOCs(0L),
-      Fabrics(1L),
-      SupportedFabrics(2L),
-      CommissionedFabrics(3L),
-      TrustedRootCertificates(4L),
-      CurrentFabricIndex(5L),
+      PHYRate(0L),
+      FullDuplex(1L),
+      PacketRxCount(2L),
+      PacketTxCount(3L),
+      TxErrCount(4L),
+      CollisionCount(5L),
+      OverrunCount(6L),
+      CarrierDetect(7L),
+      TimeSinceReset(8L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -4259,14 +4983,7 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
-      AttestationRequest(0L),
-      CertificateChainRequest(2L),
-      CSRRequest(4L),
-      AddNOC(6L),
-      UpdateNOC(7L),
-      UpdateFabricLabel(9L),
-      RemoveFabric(10L),
-      AddTrustedRootCertificate(11L),
+      ResetCounts(0L),
       ;
       private final long id;
 
@@ -4319,18 +5036,27 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class GroupKeyManagement implements BaseCluster {
-    public static final long ID = 63L;
+  public static class TimeSynchronization implements BaseCluster {
+    public static final long ID = 56L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      GroupKeyMap(0L),
-      GroupTable(1L),
-      MaxGroupsPerFabric(2L),
-      MaxGroupKeysPerFabric(3L),
+      UTCTime(0L),
+      Granularity(1L),
+      TimeSource(2L),
+      TrustedTimeSource(3L),
+      DefaultNTP(4L),
+      TimeZone(5L),
+      DSTOffset(6L),
+      LocalTime(7L),
+      TimeZoneDatabase(8L),
+      NTPServerAvailable(9L),
+      TimeZoneListMaxSize(10L),
+      DSTOffsetListMaxSize(11L),
+      SupportsDNSResolve(12L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -4359,6 +5085,11 @@ public static Attribute value(long id) throws NoSuchFieldError {
     }
 
     public enum Event {
+      DSTTableEmpty(0L),
+      DSTStatus(1L),
+      TimeZoneStatus(2L),
+      TimeFailure(3L),
+      MissingTrustedTimeSource(4L),
       ;
       private final long id;
 
@@ -4381,10 +5112,11 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
-      KeySetWrite(0L),
-      KeySetRead(1L),
-      KeySetRemove(3L),
-      KeySetReadAllIndices(4L),
+      SetUTCTime(0L),
+      SetTrustedTimeSource(1L),
+      SetTimeZone(2L),
+      SetDSTOffset(4L),
+      SetDefaultNTP(5L),
       ;
       private final long id;
 
@@ -4406,111 +5138,117 @@ public static Command value(long id) throws NoSuchFieldError {
       }
     }
 
-    @Override
-    public String getAttributeName(long id) throws NoSuchFieldError {
-      return Attribute.value(id).toString();
-    }
+    public enum SetUTCTimeCommandField {
+      UTCTime(0),
+      Granularity(1),
+      TimeSource(2),
+      ;
+      private final int id;
 
-    @Override
-    public String getEventName(long id) throws NoSuchFieldError {
-      return Event.value(id).toString();
-    }
+      SetUTCTimeCommandField(int id) {
+        this.id = id;
+      }
 
-    @Override
-    public String getCommandName(long id) throws NoSuchFieldError {
-      return Command.value(id).toString();
-    }
+      public int getID() {
+        return id;
+      }
 
-    @Override
-    public long getAttributeID(String name) throws IllegalArgumentException {
-      return Attribute.valueOf(name).getID();
+      public static SetUTCTimeCommandField value(int id) throws NoSuchFieldError {
+        for (SetUTCTimeCommandField field : SetUTCTimeCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
     }
 
-    @Override
-    public long getEventID(String name) throws IllegalArgumentException {
-      return Event.valueOf(name).getID();
-    }
+    public enum SetTrustedTimeSourceCommandField {
+      TrustedTimeSource(0),
+      ;
+      private final int id;
 
-    @Override
-    public long getCommandID(String name) throws IllegalArgumentException {
-      return Command.valueOf(name).getID();
-    }
-  }
+      SetTrustedTimeSourceCommandField(int id) {
+        this.id = id;
+      }
 
-  public static class FixedLabel implements BaseCluster {
-    public static final long ID = 64L;
+      public int getID() {
+        return id;
+      }
 
-    public long getID() {
-      return ID;
+      public static SetTrustedTimeSourceCommandField value(int id) throws NoSuchFieldError {
+        for (SetTrustedTimeSourceCommandField field : SetTrustedTimeSourceCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
     }
 
-    public enum Attribute {
-      LabelList(0L),
-      GeneratedCommandList(65528L),
-      AcceptedCommandList(65529L),
-      EventList(65530L),
-      AttributeList(65531L),
-      FeatureMap(65532L),
-      ClusterRevision(65533L),
+    public enum SetTimeZoneCommandField {
+      TimeZone(0),
       ;
-      private final long id;
+      private final int id;
 
-      Attribute(long id) {
+      SetTimeZoneCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Attribute value(long id) throws NoSuchFieldError {
-        for (Attribute attribute : Attribute.values()) {
-          if (attribute.getID() == id) {
-            return attribute;
+      public static SetTimeZoneCommandField value(int id) throws NoSuchFieldError {
+        for (SetTimeZoneCommandField field : SetTimeZoneCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
       }
     }
 
-    public enum Event {
+    public enum SetDSTOffsetCommandField {
+      DSTOffset(0),
       ;
-      private final long id;
+      private final int id;
 
-      Event(long id) {
+      SetDSTOffsetCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Event value(long id) throws NoSuchFieldError {
-        for (Event event : Event.values()) {
-          if (event.getID() == id) {
-            return event;
+      public static SetDSTOffsetCommandField value(int id) throws NoSuchFieldError {
+        for (SetDSTOffsetCommandField field : SetDSTOffsetCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
       }
     }
 
-    public enum Command {
+    public enum SetDefaultNTPCommandField {
+      DefaultNTP(0),
       ;
-      private final long id;
+      private final int id;
 
-      Command(long id) {
+      SetDefaultNTPCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Command value(long id) throws NoSuchFieldError {
-        for (Command command : Command.values()) {
-          if (command.getID() == id) {
-            return command;
+      public static SetDefaultNTPCommandField value(int id) throws NoSuchFieldError {
+        for (SetDefaultNTPCommandField field : SetDefaultNTPCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
@@ -4548,15 +5286,30 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class UserLabel implements BaseCluster {
-    public static final long ID = 65L;
+  public static class BridgedDeviceBasicInformation implements BaseCluster {
+    public static final long ID = 57L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      LabelList(0L),
+      VendorName(1L),
+      VendorID(2L),
+      ProductName(3L),
+      NodeLabel(5L),
+      HardwareVersion(7L),
+      HardwareVersionString(8L),
+      SoftwareVersion(9L),
+      SoftwareVersionString(10L),
+      ManufacturingDate(11L),
+      PartNumber(12L),
+      ProductURL(13L),
+      ProductLabel(14L),
+      SerialNumber(15L),
+      Reachable(17L),
+      UniqueID(18L),
+      ProductAppearance(20L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -4585,6 +5338,10 @@ public static Attribute value(long id) throws NoSuchFieldError {
     }
 
     public enum Event {
+      StartUp(0L),
+      ShutDown(1L),
+      Leave(2L),
+      ReachableChanged(3L),
       ;
       private final long id;
 
@@ -4659,14 +5416,17 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class ProxyConfiguration implements BaseCluster {
-    public static final long ID = 66L;
+  public static class Switch implements BaseCluster {
+    public static final long ID = 59L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
+      NumberOfPositions(0L),
+      CurrentPosition(1L),
+      MultiPressMax(2L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -4695,6 +5455,13 @@ public static Attribute value(long id) throws NoSuchFieldError {
     }
 
     public enum Event {
+      SwitchLatched(0L),
+      InitialPress(1L),
+      LongPress(2L),
+      ShortRelease(3L),
+      LongRelease(4L),
+      MultiPressOngoing(5L),
+      MultiPressComplete(6L),
       ;
       private final long id;
 
@@ -4769,14 +5536,17 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class ProxyDiscovery implements BaseCluster {
-    public static final long ID = 67L;
+  public static class AdministratorCommissioning implements BaseCluster {
+    public static final long ID = 60L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
+      WindowStatus(0L),
+      AdminFabricIndex(1L),
+      AdminVendorId(2L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -4827,6 +5597,9 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
+      OpenCommissioningWindow(0L),
+      OpenBasicCommissioningWindow(1L),
+      RevokeCommissioning(2L),
       ;
       private final long id;
 
@@ -4848,6 +5621,58 @@ public static Command value(long id) throws NoSuchFieldError {
       }
     }
 
+    public enum OpenCommissioningWindowCommandField {
+      CommissioningTimeout(0),
+      PAKEPasscodeVerifier(1),
+      Discriminator(2),
+      Iterations(3),
+      Salt(4),
+      ;
+      private final int id;
+
+      OpenCommissioningWindowCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static OpenCommissioningWindowCommandField value(int id) throws NoSuchFieldError {
+        for (OpenCommissioningWindowCommandField field :
+            OpenCommissioningWindowCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum OpenBasicCommissioningWindowCommandField {
+      CommissioningTimeout(0),
+      ;
+      private final int id;
+
+      OpenBasicCommissioningWindowCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static OpenBasicCommissioningWindowCommandField value(int id) throws NoSuchFieldError {
+        for (OpenBasicCommissioningWindowCommandField field :
+            OpenBasicCommissioningWindowCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
     @Override
     public String getAttributeName(long id) throws NoSuchFieldError {
       return Attribute.value(id).toString();
@@ -4879,14 +5704,20 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class ProxyValid implements BaseCluster {
-    public static final long ID = 68L;
+  public static class OperationalCredentials implements BaseCluster {
+    public static final long ID = 62L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
+      NOCs(0L),
+      Fabrics(1L),
+      SupportedFabrics(2L),
+      CommissionedFabrics(3L),
+      TrustedRootCertificates(4L),
+      CurrentFabricIndex(5L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -4937,8 +5768,16 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
-      ;
-      private final long id;
+      AttestationRequest(0L),
+      CertificateChainRequest(2L),
+      CSRRequest(4L),
+      AddNOC(6L),
+      UpdateNOC(7L),
+      UpdateFabricLabel(9L),
+      RemoveFabric(10L),
+      AddTrustedRootCertificate(11L),
+      ;
+      private final long id;
 
       Command(long id) {
         this.id = id;
@@ -4958,6 +5797,198 @@ public static Command value(long id) throws NoSuchFieldError {
       }
     }
 
+    public enum AttestationRequestCommandField {
+      AttestationNonce(0),
+      ;
+      private final int id;
+
+      AttestationRequestCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static AttestationRequestCommandField value(int id) throws NoSuchFieldError {
+        for (AttestationRequestCommandField field : AttestationRequestCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum CertificateChainRequestCommandField {
+      CertificateType(0),
+      ;
+      private final int id;
+
+      CertificateChainRequestCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static CertificateChainRequestCommandField value(int id) throws NoSuchFieldError {
+        for (CertificateChainRequestCommandField field :
+            CertificateChainRequestCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum CSRRequestCommandField {
+      CSRNonce(0),
+      IsForUpdateNOC(1),
+      ;
+      private final int id;
+
+      CSRRequestCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static CSRRequestCommandField value(int id) throws NoSuchFieldError {
+        for (CSRRequestCommandField field : CSRRequestCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum AddNOCCommandField {
+      NOCValue(0),
+      ICACValue(1),
+      IPKValue(2),
+      CaseAdminSubject(3),
+      AdminVendorId(4),
+      ;
+      private final int id;
+
+      AddNOCCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static AddNOCCommandField value(int id) throws NoSuchFieldError {
+        for (AddNOCCommandField field : AddNOCCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum UpdateNOCCommandField {
+      NOCValue(0),
+      ICACValue(1),
+      ;
+      private final int id;
+
+      UpdateNOCCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static UpdateNOCCommandField value(int id) throws NoSuchFieldError {
+        for (UpdateNOCCommandField field : UpdateNOCCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum UpdateFabricLabelCommandField {
+      Label(0),
+      ;
+      private final int id;
+
+      UpdateFabricLabelCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static UpdateFabricLabelCommandField value(int id) throws NoSuchFieldError {
+        for (UpdateFabricLabelCommandField field : UpdateFabricLabelCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum RemoveFabricCommandField {
+      FabricIndex(0),
+      ;
+      private final int id;
+
+      RemoveFabricCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static RemoveFabricCommandField value(int id) throws NoSuchFieldError {
+        for (RemoveFabricCommandField field : RemoveFabricCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum AddTrustedRootCertificateCommandField {
+      RootCACertificate(0),
+      ;
+      private final int id;
+
+      AddTrustedRootCertificateCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static AddTrustedRootCertificateCommandField value(int id) throws NoSuchFieldError {
+        for (AddTrustedRootCertificateCommandField field :
+            AddTrustedRootCertificateCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
     @Override
     public String getAttributeName(long id) throws NoSuchFieldError {
       return Attribute.value(id).toString();
@@ -4989,15 +6020,18 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class BooleanState implements BaseCluster {
-    public static final long ID = 69L;
+  public static class GroupKeyManagement implements BaseCluster {
+    public static final long ID = 63L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      StateValue(0L),
+      GroupKeyMap(0L),
+      GroupTable(1L),
+      MaxGroupsPerFabric(2L),
+      MaxGroupKeysPerFabric(3L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -5026,7 +6060,6 @@ public static Attribute value(long id) throws NoSuchFieldError {
     }
 
     public enum Event {
-      StateChange(0L),
       ;
       private final long id;
 
@@ -5049,6 +6082,10 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
+      KeySetWrite(0L),
+      KeySetRead(1L),
+      KeySetRemove(3L),
+      KeySetReadAllIndices(4L),
       ;
       private final long id;
 
@@ -5070,6 +6107,98 @@ public static Command value(long id) throws NoSuchFieldError {
       }
     }
 
+    public enum KeySetWriteCommandField {
+      GroupKeySet(0),
+      ;
+      private final int id;
+
+      KeySetWriteCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static KeySetWriteCommandField value(int id) throws NoSuchFieldError {
+        for (KeySetWriteCommandField field : KeySetWriteCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum KeySetReadCommandField {
+      GroupKeySetID(0),
+      ;
+      private final int id;
+
+      KeySetReadCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static KeySetReadCommandField value(int id) throws NoSuchFieldError {
+        for (KeySetReadCommandField field : KeySetReadCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum KeySetRemoveCommandField {
+      GroupKeySetID(0),
+      ;
+      private final int id;
+
+      KeySetRemoveCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static KeySetRemoveCommandField value(int id) throws NoSuchFieldError {
+        for (KeySetRemoveCommandField field : KeySetRemoveCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum KeySetReadAllIndicesCommandField {
+      GroupKeySetIDs(0),
+      ;
+      private final int id;
+
+      KeySetReadAllIndicesCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static KeySetReadAllIndicesCommandField value(int id) throws NoSuchFieldError {
+        for (KeySetReadAllIndicesCommandField field : KeySetReadAllIndicesCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
     @Override
     public String getAttributeName(long id) throws NoSuchFieldError {
       return Attribute.value(id).toString();
@@ -5101,20 +6230,15 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class IcdManagement implements BaseCluster {
-    public static final long ID = 70L;
+  public static class FixedLabel implements BaseCluster {
+    public static final long ID = 64L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      IdleModeInterval(0L),
-      ActiveModeInterval(1L),
-      ActiveModeThreshold(2L),
-      RegisteredClients(3L),
-      ICDCounter(4L),
-      ClientsSupportedPerFabric(5L),
+      LabelList(0L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -5165,9 +6289,6 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
-      RegisterClient(0L),
-      UnregisterClient(2L),
-      StayActiveRequest(3L),
       ;
       private final long id;
 
@@ -5220,20 +6341,15 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class ModeSelect implements BaseCluster {
-    public static final long ID = 80L;
+  public static class UserLabel implements BaseCluster {
+    public static final long ID = 65L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      Description(0L),
-      StandardNamespace(1L),
-      SupportedModes(2L),
-      CurrentMode(3L),
-      StartUpMode(4L),
-      OnMode(5L),
+      LabelList(0L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -5284,7 +6400,6 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
-      ChangeToMode(0L),
       ;
       private final long id;
 
@@ -5337,20 +6452,14 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class TemperatureControl implements BaseCluster {
-    public static final long ID = 86L;
+  public static class ProxyConfiguration implements BaseCluster {
+    public static final long ID = 66L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      TemperatureSetpoint(0L),
-      MinTemperature(1L),
-      MaxTemperature(2L),
-      Step(3L),
-      CurrentTemperatureLevelIndex(4L),
-      SupportedTemperatureLevels(5L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -5401,7 +6510,6 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
-      SetTemperature(0L),
       ;
       private final long id;
 
@@ -5454,17 +6562,14 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class RefrigeratorAlarm implements BaseCluster {
-    public static final long ID = 87L;
+  public static class ProxyDiscovery implements BaseCluster {
+    public static final long ID = 67L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      Mask(0L),
-      Latch(1L),
-      State(2L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -5493,7 +6598,6 @@ public static Attribute value(long id) throws NoSuchFieldError {
     }
 
     public enum Event {
-      Notify(0L),
       ;
       private final long id;
 
@@ -5516,7 +6620,6 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
-      Reset(0L),
       ;
       private final long id;
 
@@ -5569,15 +6672,14 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class AirQuality implements BaseCluster {
-    public static final long ID = 91L;
+  public static class ProxyValid implements BaseCluster {
+    public static final long ID = 68L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      AirQuality(0L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -5680,26 +6782,15 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class SmokeCoAlarm implements BaseCluster {
-    public static final long ID = 92L;
+  public static class BooleanState implements BaseCluster {
+    public static final long ID = 69L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      ExpressedState(0L),
-      SmokeState(1L),
-      COState(2L),
-      BatteryAlert(3L),
-      DeviceMuted(4L),
-      TestInProgress(5L),
-      HardwareFaultAlert(6L),
-      EndOfServiceAlert(7L),
-      InterconnectSmokeAlarm(8L),
-      InterconnectCOAlarm(9L),
-      ContaminationState(10L),
-      SensitivityLevel(11L),
+      StateValue(0L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -5728,17 +6819,7 @@ public static Attribute value(long id) throws NoSuchFieldError {
     }
 
     public enum Event {
-      SmokeAlarm(0L),
-      COAlarm(1L),
-      LowBattery(2L),
-      HardwareFault(3L),
-      EndOfService(4L),
-      SelfTestComplete(5L),
-      AlarmMuted(6L),
-      MuteEnded(7L),
-      InterconnectSmokeAlarm(8L),
-      InterconnectCOAlarm(9L),
-      AllClear(10L),
+      StateChange(0L),
       ;
       private final long id;
 
@@ -5761,7 +6842,6 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
-      SelfTestRequest(0L),
       ;
       private final long id;
 
@@ -5814,18 +6894,20 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class HepaFilterMonitoring implements BaseCluster {
-    public static final long ID = 113L;
+  public static class IcdManagement implements BaseCluster {
+    public static final long ID = 70L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      Condition(0L),
-      DegradationDirection(1L),
-      ChangeIndication(2L),
-      InPlaceIndicator(3L),
+      IdleModeInterval(0L),
+      ActiveModeInterval(1L),
+      ActiveModeThreshold(2L),
+      RegisteredClients(3L),
+      ICDCounter(4L),
+      ClientsSupportedPerFabric(5L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -5876,7 +6958,9 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
-      ResetCondition(0L),
+      RegisterClient(0L),
+      UnregisterClient(2L),
+      StayActiveRequest(3L),
       ;
       private final long id;
 
@@ -5898,6 +6982,56 @@ public static Command value(long id) throws NoSuchFieldError {
       }
     }
 
+    public enum RegisterClientCommandField {
+      CheckInNodeID(0),
+      MonitoredSubject(1),
+      Key(2),
+      VerificationKey(3),
+      ;
+      private final int id;
+
+      RegisterClientCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static RegisterClientCommandField value(int id) throws NoSuchFieldError {
+        for (RegisterClientCommandField field : RegisterClientCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum UnregisterClientCommandField {
+      CheckInNodeID(0),
+      Key(1),
+      ;
+      private final int id;
+
+      UnregisterClientCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static UnregisterClientCommandField value(int id) throws NoSuchFieldError {
+        for (UnregisterClientCommandField field : UnregisterClientCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
     @Override
     public String getAttributeName(long id) throws NoSuchFieldError {
       return Attribute.value(id).toString();
@@ -5929,18 +7063,20 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class ActivatedCarbonFilterMonitoring implements BaseCluster {
-    public static final long ID = 114L;
+  public static class ModeSelect implements BaseCluster {
+    public static final long ID = 80L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      Condition(0L),
-      DegradationDirection(1L),
-      ChangeIndication(2L),
-      InPlaceIndicator(3L),
+      Description(0L),
+      StandardNamespace(1L),
+      SupportedModes(2L),
+      CurrentMode(3L),
+      StartUpMode(4L),
+      OnMode(5L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -5991,7 +7127,7 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
-      ResetCondition(0L),
+      ChangeToMode(0L),
       ;
       private final long id;
 
@@ -6013,6 +7149,29 @@ public static Command value(long id) throws NoSuchFieldError {
       }
     }
 
+    public enum ChangeToModeCommandField {
+      NewMode(0),
+      ;
+      private final int id;
+
+      ChangeToModeCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static ChangeToModeCommandField value(int id) throws NoSuchFieldError {
+        for (ChangeToModeCommandField field : ChangeToModeCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
     @Override
     public String getAttributeName(long id) throws NoSuchFieldError {
       return Attribute.value(id).toString();
@@ -6044,18 +7203,20 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class CeramicFilterMonitoring implements BaseCluster {
-    public static final long ID = 115L;
+  public static class TemperatureControl implements BaseCluster {
+    public static final long ID = 86L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      Condition(0L),
-      DegradationDirection(1L),
-      ChangeIndication(2L),
-      InPlaceIndicator(3L),
+      TemperatureSetpoint(0L),
+      MinTemperature(1L),
+      MaxTemperature(2L),
+      Step(3L),
+      CurrentTemperatureLevelIndex(4L),
+      SupportedTemperatureLevels(5L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -6106,7 +7267,7 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
-      ResetCondition(0L),
+      SetTemperature(0L),
       ;
       private final long id;
 
@@ -6128,6 +7289,30 @@ public static Command value(long id) throws NoSuchFieldError {
       }
     }
 
+    public enum SetTemperatureCommandField {
+      TargetTemperature(0),
+      TargetTemperatureLevel(1),
+      ;
+      private final int id;
+
+      SetTemperatureCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static SetTemperatureCommandField value(int id) throws NoSuchFieldError {
+        for (SetTemperatureCommandField field : SetTemperatureCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
     @Override
     public String getAttributeName(long id) throws NoSuchFieldError {
       return Attribute.value(id).toString();
@@ -6159,18 +7344,17 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class ElectrostaticFilterMonitoring implements BaseCluster {
-    public static final long ID = 116L;
+  public static class RefrigeratorAlarm implements BaseCluster {
+    public static final long ID = 87L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      Condition(0L),
-      DegradationDirection(1L),
-      ChangeIndication(2L),
-      InPlaceIndicator(3L),
+      Mask(0L),
+      Latch(1L),
+      State(2L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -6199,6 +7383,7 @@ public static Attribute value(long id) throws NoSuchFieldError {
     }
 
     public enum Event {
+      Notify(0L),
       ;
       private final long id;
 
@@ -6221,7 +7406,7 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
-      ResetCondition(0L),
+      Reset(0L),
       ;
       private final long id;
 
@@ -6243,6 +7428,30 @@ public static Command value(long id) throws NoSuchFieldError {
       }
     }
 
+    public enum ResetCommandField {
+      Alarms(0),
+      Mask(1),
+      ;
+      private final int id;
+
+      ResetCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static ResetCommandField value(int id) throws NoSuchFieldError {
+        for (ResetCommandField field : ResetCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
     @Override
     public String getAttributeName(long id) throws NoSuchFieldError {
       return Attribute.value(id).toString();
@@ -6274,18 +7483,15 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class UvFilterMonitoring implements BaseCluster {
-    public static final long ID = 117L;
+  public static class AirQuality implements BaseCluster {
+    public static final long ID = 91L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      Condition(0L),
-      DegradationDirection(1L),
-      ChangeIndication(2L),
-      InPlaceIndicator(3L),
+      AirQuality(0L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -6336,7 +7542,6 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
-      ResetCondition(0L),
       ;
       private final long id;
 
@@ -6389,18 +7594,26 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class IonizingFilterMonitoring implements BaseCluster {
-    public static final long ID = 118L;
+  public static class SmokeCoAlarm implements BaseCluster {
+    public static final long ID = 92L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      Condition(0L),
-      DegradationDirection(1L),
-      ChangeIndication(2L),
-      InPlaceIndicator(3L),
+      ExpressedState(0L),
+      SmokeState(1L),
+      COState(2L),
+      BatteryAlert(3L),
+      DeviceMuted(4L),
+      TestInProgress(5L),
+      HardwareFaultAlert(6L),
+      EndOfServiceAlert(7L),
+      InterconnectSmokeAlarm(8L),
+      InterconnectCOAlarm(9L),
+      ContaminationState(10L),
+      SensitivityLevel(11L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -6429,6 +7642,17 @@ public static Attribute value(long id) throws NoSuchFieldError {
     }
 
     public enum Event {
+      SmokeAlarm(0L),
+      COAlarm(1L),
+      LowBattery(2L),
+      HardwareFault(3L),
+      EndOfService(4L),
+      SelfTestComplete(5L),
+      AlarmMuted(6L),
+      MuteEnded(7L),
+      InterconnectSmokeAlarm(8L),
+      InterconnectCOAlarm(9L),
+      AllClear(10L),
       ;
       private final long id;
 
@@ -6451,7 +7675,7 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
-      ResetCondition(0L),
+      SelfTestRequest(0L),
       ;
       private final long id;
 
@@ -6504,8 +7728,8 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class ZeoliteFilterMonitoring implements BaseCluster {
-    public static final long ID = 119L;
+  public static class HepaFilterMonitoring implements BaseCluster {
+    public static final long ID = 113L;
 
     public long getID() {
       return ID;
@@ -6619,8 +7843,8 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class OzoneFilterMonitoring implements BaseCluster {
-    public static final long ID = 120L;
+  public static class ActivatedCarbonFilterMonitoring implements BaseCluster {
+    public static final long ID = 114L;
 
     public long getID() {
       return ID;
@@ -6734,8 +7958,8 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class WaterTankMonitoring implements BaseCluster {
-    public static final long ID = 121L;
+  public static class CeramicFilterMonitoring implements BaseCluster {
+    public static final long ID = 115L;
 
     public long getID() {
       return ID;
@@ -6849,8 +8073,8 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class FuelTankMonitoring implements BaseCluster {
-    public static final long ID = 122L;
+  public static class ElectrostaticFilterMonitoring implements BaseCluster {
+    public static final long ID = 116L;
 
     public long getID() {
       return ID;
@@ -6964,8 +8188,8 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class InkCartridgeMonitoring implements BaseCluster {
-    public static final long ID = 123L;
+  public static class UvFilterMonitoring implements BaseCluster {
+    public static final long ID = 117L;
 
     public long getID() {
       return ID;
@@ -7079,8 +8303,8 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class TonerCartridgeMonitoring implements BaseCluster {
-    public static final long ID = 124L;
+  public static class IonizingFilterMonitoring implements BaseCluster {
+    public static final long ID = 118L;
 
     public long getID() {
       return ID;
@@ -7194,50 +8418,18 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class DoorLock implements BaseCluster {
-    public static final long ID = 257L;
+  public static class ZeoliteFilterMonitoring implements BaseCluster {
+    public static final long ID = 119L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      LockState(0L),
-      LockType(1L),
-      ActuatorEnabled(2L),
-      DoorState(3L),
-      DoorOpenEvents(4L),
-      DoorClosedEvents(5L),
-      OpenPeriod(6L),
-      NumberOfTotalUsersSupported(17L),
-      NumberOfPINUsersSupported(18L),
-      NumberOfRFIDUsersSupported(19L),
-      NumberOfWeekDaySchedulesSupportedPerUser(20L),
-      NumberOfYearDaySchedulesSupportedPerUser(21L),
-      NumberOfHolidaySchedulesSupported(22L),
-      MaxPINCodeLength(23L),
-      MinPINCodeLength(24L),
-      MaxRFIDCodeLength(25L),
-      MinRFIDCodeLength(26L),
-      CredentialRulesSupport(27L),
-      NumberOfCredentialsSupportedPerUser(28L),
-      Language(33L),
-      LEDSettings(34L),
-      AutoRelockTime(35L),
-      SoundVolume(36L),
-      OperatingMode(37L),
-      SupportedOperatingModes(38L),
-      DefaultConfigurationRegister(39L),
-      EnableLocalProgramming(40L),
-      EnableOneTouchLocking(41L),
-      EnableInsideStatusLED(42L),
-      EnablePrivacyModeButton(43L),
-      LocalProgrammingFeatures(44L),
-      WrongCodeEntryLimit(48L),
-      UserCodeTemporaryDisableTime(49L),
-      SendPINOverTheAir(50L),
-      RequirePINforRemoteOperation(51L),
-      ExpiringUserTimeout(53L),
+      Condition(0L),
+      DegradationDirection(1L),
+      ChangeIndication(2L),
+      InPlaceIndicator(3L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -7266,11 +8458,6 @@ public static Attribute value(long id) throws NoSuchFieldError {
     }
 
     public enum Event {
-      DoorLockAlarm(0L),
-      DoorStateChange(1L),
-      LockOperation(2L),
-      LockOperationError(3L),
-      LockUserChange(4L),
       ;
       private final long id;
 
@@ -7293,25 +8480,7 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
-      LockDoor(0L),
-      UnlockDoor(1L),
-      UnlockWithTimeout(3L),
-      SetWeekDaySchedule(11L),
-      GetWeekDaySchedule(12L),
-      ClearWeekDaySchedule(13L),
-      SetYearDaySchedule(14L),
-      GetYearDaySchedule(15L),
-      ClearYearDaySchedule(16L),
-      SetHolidaySchedule(17L),
-      GetHolidaySchedule(18L),
-      ClearHolidaySchedule(19L),
-      SetUser(26L),
-      GetUser(27L),
-      ClearUser(29L),
-      SetCredential(34L),
-      GetCredentialStatus(36L),
-      ClearCredential(38L),
-      UnboltDoor(39L),
+      ResetCondition(0L),
       ;
       private final long id;
 
@@ -7364,36 +8533,18 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class WindowCovering implements BaseCluster {
-    public static final long ID = 258L;
+  public static class OzoneFilterMonitoring implements BaseCluster {
+    public static final long ID = 120L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      Type(0L),
-      PhysicalClosedLimitLift(1L),
-      PhysicalClosedLimitTilt(2L),
-      CurrentPositionLift(3L),
-      CurrentPositionTilt(4L),
-      NumberOfActuationsLift(5L),
-      NumberOfActuationsTilt(6L),
-      ConfigStatus(7L),
-      CurrentPositionLiftPercentage(8L),
-      CurrentPositionTiltPercentage(9L),
-      OperationalStatus(10L),
-      TargetPositionLiftPercent100ths(11L),
-      TargetPositionTiltPercent100ths(12L),
-      EndProductType(13L),
-      CurrentPositionLiftPercent100ths(14L),
-      CurrentPositionTiltPercent100ths(15L),
-      InstalledOpenLimitLift(16L),
-      InstalledClosedLimitLift(17L),
-      InstalledOpenLimitTilt(18L),
-      InstalledClosedLimitTilt(19L),
-      Mode(23L),
-      SafetyStatus(26L),
+      Condition(0L),
+      DegradationDirection(1L),
+      ChangeIndication(2L),
+      InPlaceIndicator(3L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -7444,13 +8595,7 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
-      UpOrOpen(0L),
-      DownOrClose(1L),
-      StopMotion(2L),
-      GoToLiftValue(4L),
-      GoToLiftPercentage(5L),
-      GoToTiltValue(7L),
-      GoToTiltPercentage(8L),
+      ResetCondition(0L),
       ;
       private final long id;
 
@@ -7503,24 +8648,18 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class BarrierControl implements BaseCluster {
-    public static final long ID = 259L;
+  public static class WaterTankMonitoring implements BaseCluster {
+    public static final long ID = 121L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      BarrierMovingState(1L),
-      BarrierSafetyStatus(2L),
-      BarrierCapabilities(3L),
-      BarrierOpenEvents(4L),
-      BarrierCloseEvents(5L),
-      BarrierCommandOpenEvents(6L),
-      BarrierCommandCloseEvents(7L),
-      BarrierOpenPeriod(8L),
-      BarrierClosePeriod(9L),
-      BarrierPosition(10L),
+      Condition(0L),
+      DegradationDirection(1L),
+      ChangeIndication(2L),
+      InPlaceIndicator(3L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -7571,8 +8710,7 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
-      BarrierControlGoToPercent(0L),
-      BarrierControlStop(1L),
+      ResetCondition(0L),
       ;
       private final long id;
 
@@ -7625,37 +8763,18 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class PumpConfigurationAndControl implements BaseCluster {
-    public static final long ID = 512L;
+  public static class FuelTankMonitoring implements BaseCluster {
+    public static final long ID = 122L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      MaxPressure(0L),
-      MaxSpeed(1L),
-      MaxFlow(2L),
-      MinConstPressure(3L),
-      MaxConstPressure(4L),
-      MinCompPressure(5L),
-      MaxCompPressure(6L),
-      MinConstSpeed(7L),
-      MaxConstSpeed(8L),
-      MinConstFlow(9L),
-      MaxConstFlow(10L),
-      MinConstTemp(11L),
-      MaxConstTemp(12L),
-      PumpStatus(16L),
-      EffectiveOperationMode(17L),
-      EffectiveControlMode(18L),
-      Capacity(19L),
-      Speed(20L),
-      LifetimeRunningHours(21L),
-      Power(22L),
-      LifetimeEnergyConsumed(23L),
-      OperationMode(32L),
-      ControlMode(33L),
+      Condition(0L),
+      DegradationDirection(1L),
+      ChangeIndication(2L),
+      InPlaceIndicator(3L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -7684,23 +8803,6 @@ public static Attribute value(long id) throws NoSuchFieldError {
     }
 
     public enum Event {
-      SupplyVoltageLow(0L),
-      SupplyVoltageHigh(1L),
-      PowerMissingPhase(2L),
-      SystemPressureLow(3L),
-      SystemPressureHigh(4L),
-      DryRunning(5L),
-      MotorTemperatureHigh(6L),
-      PumpMotorFatalFailure(7L),
-      ElectronicTemperatureHigh(8L),
-      PumpBlocked(9L),
-      SensorFailure(10L),
-      ElectronicNonFatalFailure(11L),
-      ElectronicFatalFailure(12L),
-      GeneralFault(13L),
-      Leakage(14L),
-      AirDetection(15L),
-      TurbineOperation(16L),
       ;
       private final long id;
 
@@ -7723,6 +8825,7 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
+      ResetCondition(0L),
       ;
       private final long id;
 
@@ -7775,63 +8878,18 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class Thermostat implements BaseCluster {
-    public static final long ID = 513L;
+  public static class InkCartridgeMonitoring implements BaseCluster {
+    public static final long ID = 123L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      LocalTemperature(0L),
-      OutdoorTemperature(1L),
-      Occupancy(2L),
-      AbsMinHeatSetpointLimit(3L),
-      AbsMaxHeatSetpointLimit(4L),
-      AbsMinCoolSetpointLimit(5L),
-      AbsMaxCoolSetpointLimit(6L),
-      PICoolingDemand(7L),
-      PIHeatingDemand(8L),
-      HVACSystemTypeConfiguration(9L),
-      LocalTemperatureCalibration(16L),
-      OccupiedCoolingSetpoint(17L),
-      OccupiedHeatingSetpoint(18L),
-      UnoccupiedCoolingSetpoint(19L),
-      UnoccupiedHeatingSetpoint(20L),
-      MinHeatSetpointLimit(21L),
-      MaxHeatSetpointLimit(22L),
-      MinCoolSetpointLimit(23L),
-      MaxCoolSetpointLimit(24L),
-      MinSetpointDeadBand(25L),
-      RemoteSensing(26L),
-      ControlSequenceOfOperation(27L),
-      SystemMode(28L),
-      ThermostatRunningMode(30L),
-      StartOfWeek(32L),
-      NumberOfWeeklyTransitions(33L),
-      NumberOfDailyTransitions(34L),
-      TemperatureSetpointHold(35L),
-      TemperatureSetpointHoldDuration(36L),
-      ThermostatProgrammingOperationMode(37L),
-      ThermostatRunningState(41L),
-      SetpointChangeSource(48L),
-      SetpointChangeAmount(49L),
-      SetpointChangeSourceTimestamp(50L),
-      OccupiedSetback(52L),
-      OccupiedSetbackMin(53L),
-      OccupiedSetbackMax(54L),
-      UnoccupiedSetback(55L),
-      UnoccupiedSetbackMin(56L),
-      UnoccupiedSetbackMax(57L),
-      EmergencyHeatDelta(58L),
-      ACType(64L),
-      ACCapacity(65L),
-      ACRefrigerantType(66L),
-      ACCompressorType(67L),
-      ACErrorCode(68L),
-      ACLouverPosition(69L),
-      ACCoilTemperature(70L),
-      ACCapacityformat(71L),
+      Condition(0L),
+      DegradationDirection(1L),
+      ChangeIndication(2L),
+      InPlaceIndicator(3L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -7882,10 +8940,7 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
-      SetpointRaiseLower(0L),
-      SetWeeklySchedule(1L),
-      GetWeeklySchedule(2L),
-      ClearWeeklySchedule(3L),
+      ResetCondition(0L),
       ;
       private final long id;
 
@@ -7938,25 +8993,18 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class FanControl implements BaseCluster {
-    public static final long ID = 514L;
+  public static class TonerCartridgeMonitoring implements BaseCluster {
+    public static final long ID = 124L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      FanMode(0L),
-      FanModeSequence(1L),
-      PercentSetting(2L),
-      PercentCurrent(3L),
-      SpeedMax(4L),
-      SpeedSetting(5L),
-      SpeedCurrent(6L),
-      RockSupport(7L),
-      RockSetting(8L),
-      WindSupport(9L),
-      WindSetting(10L),
+      Condition(0L),
+      DegradationDirection(1L),
+      ChangeIndication(2L),
+      InPlaceIndicator(3L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -8007,6 +9055,7 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
+      ResetCondition(0L),
       ;
       private final long id;
 
@@ -8059,45 +9108,83 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class ThermostatUserInterfaceConfiguration implements BaseCluster {
-    public static final long ID = 516L;
+  public static class DoorLock implements BaseCluster {
+    public static final long ID = 257L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      TemperatureDisplayMode(0L),
-      KeypadLockout(1L),
-      ScheduleProgrammingVisibility(2L),
-      GeneratedCommandList(65528L),
-      AcceptedCommandList(65529L),
-      EventList(65530L),
-      AttributeList(65531L),
-      FeatureMap(65532L),
-      ClusterRevision(65533L),
-      ;
-      private final long id;
-
-      Attribute(long id) {
-        this.id = id;
-      }
-
-      public long getID() {
-        return id;
-      }
-
-      public static Attribute value(long id) throws NoSuchFieldError {
-        for (Attribute attribute : Attribute.values()) {
-          if (attribute.getID() == id) {
-            return attribute;
-          }
-        }
-        throw new NoSuchFieldError();
-      }
-    }
-
-    public enum Event {
+      LockState(0L),
+      LockType(1L),
+      ActuatorEnabled(2L),
+      DoorState(3L),
+      DoorOpenEvents(4L),
+      DoorClosedEvents(5L),
+      OpenPeriod(6L),
+      NumberOfTotalUsersSupported(17L),
+      NumberOfPINUsersSupported(18L),
+      NumberOfRFIDUsersSupported(19L),
+      NumberOfWeekDaySchedulesSupportedPerUser(20L),
+      NumberOfYearDaySchedulesSupportedPerUser(21L),
+      NumberOfHolidaySchedulesSupported(22L),
+      MaxPINCodeLength(23L),
+      MinPINCodeLength(24L),
+      MaxRFIDCodeLength(25L),
+      MinRFIDCodeLength(26L),
+      CredentialRulesSupport(27L),
+      NumberOfCredentialsSupportedPerUser(28L),
+      Language(33L),
+      LEDSettings(34L),
+      AutoRelockTime(35L),
+      SoundVolume(36L),
+      OperatingMode(37L),
+      SupportedOperatingModes(38L),
+      DefaultConfigurationRegister(39L),
+      EnableLocalProgramming(40L),
+      EnableOneTouchLocking(41L),
+      EnableInsideStatusLED(42L),
+      EnablePrivacyModeButton(43L),
+      LocalProgrammingFeatures(44L),
+      WrongCodeEntryLimit(48L),
+      UserCodeTemporaryDisableTime(49L),
+      SendPINOverTheAir(50L),
+      RequirePINforRemoteOperation(51L),
+      ExpiringUserTimeout(53L),
+      GeneratedCommandList(65528L),
+      AcceptedCommandList(65529L),
+      EventList(65530L),
+      AttributeList(65531L),
+      FeatureMap(65532L),
+      ClusterRevision(65533L),
+      ;
+      private final long id;
+
+      Attribute(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Attribute value(long id) throws NoSuchFieldError {
+        for (Attribute attribute : Attribute.values()) {
+          if (attribute.getID() == id) {
+            return attribute;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum Event {
+      DoorLockAlarm(0L),
+      DoorStateChange(1L),
+      LockOperation(2L),
+      LockOperationError(3L),
+      LockUserChange(4L),
       ;
       private final long id;
 
@@ -8120,6 +9207,25 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
+      LockDoor(0L),
+      UnlockDoor(1L),
+      UnlockWithTimeout(3L),
+      SetWeekDaySchedule(11L),
+      GetWeekDaySchedule(12L),
+      ClearWeekDaySchedule(13L),
+      SetYearDaySchedule(14L),
+      GetYearDaySchedule(15L),
+      ClearYearDaySchedule(16L),
+      SetHolidaySchedule(17L),
+      GetHolidaySchedule(18L),
+      ClearHolidaySchedule(19L),
+      SetUser(26L),
+      GetUser(27L),
+      ClearUser(29L),
+      SetCredential(34L),
+      GetCredentialStatus(36L),
+      ClearCredential(38L),
+      UnboltDoor(39L),
       ;
       private final long id;
 
@@ -8141,420 +9247,465 @@ public static Command value(long id) throws NoSuchFieldError {
       }
     }
 
-    @Override
-    public String getAttributeName(long id) throws NoSuchFieldError {
-      return Attribute.value(id).toString();
-    }
+    public enum LockDoorCommandField {
+      PINCode(0),
+      ;
+      private final int id;
 
-    @Override
-    public String getEventName(long id) throws NoSuchFieldError {
-      return Event.value(id).toString();
-    }
+      LockDoorCommandField(int id) {
+        this.id = id;
+      }
 
-    @Override
-    public String getCommandName(long id) throws NoSuchFieldError {
-      return Command.value(id).toString();
-    }
+      public int getID() {
+        return id;
+      }
 
-    @Override
-    public long getAttributeID(String name) throws IllegalArgumentException {
-      return Attribute.valueOf(name).getID();
+      public static LockDoorCommandField value(int id) throws NoSuchFieldError {
+        for (LockDoorCommandField field : LockDoorCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
     }
 
-    @Override
-    public long getEventID(String name) throws IllegalArgumentException {
-      return Event.valueOf(name).getID();
-    }
+    public enum UnlockDoorCommandField {
+      PINCode(0),
+      ;
+      private final int id;
 
-    @Override
-    public long getCommandID(String name) throws IllegalArgumentException {
-      return Command.valueOf(name).getID();
-    }
-  }
+      UnlockDoorCommandField(int id) {
+        this.id = id;
+      }
 
-  public static class ColorControl implements BaseCluster {
-    public static final long ID = 768L;
+      public int getID() {
+        return id;
+      }
 
-    public long getID() {
-      return ID;
+      public static UnlockDoorCommandField value(int id) throws NoSuchFieldError {
+        for (UnlockDoorCommandField field : UnlockDoorCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
     }
 
-    public enum Attribute {
-      CurrentHue(0L),
-      CurrentSaturation(1L),
-      RemainingTime(2L),
-      CurrentX(3L),
-      CurrentY(4L),
-      DriftCompensation(5L),
-      CompensationText(6L),
-      ColorTemperatureMireds(7L),
-      ColorMode(8L),
-      Options(15L),
-      NumberOfPrimaries(16L),
-      Primary1X(17L),
-      Primary1Y(18L),
-      Primary1Intensity(19L),
-      Primary2X(21L),
-      Primary2Y(22L),
-      Primary2Intensity(23L),
-      Primary3X(25L),
-      Primary3Y(26L),
-      Primary3Intensity(27L),
-      Primary4X(32L),
-      Primary4Y(33L),
-      Primary4Intensity(34L),
-      Primary5X(36L),
-      Primary5Y(37L),
-      Primary5Intensity(38L),
-      Primary6X(40L),
-      Primary6Y(41L),
-      Primary6Intensity(42L),
-      WhitePointX(48L),
-      WhitePointY(49L),
-      ColorPointRX(50L),
-      ColorPointRY(51L),
-      ColorPointRIntensity(52L),
-      ColorPointGX(54L),
-      ColorPointGY(55L),
-      ColorPointGIntensity(56L),
-      ColorPointBX(58L),
-      ColorPointBY(59L),
-      ColorPointBIntensity(60L),
-      EnhancedCurrentHue(16384L),
-      EnhancedColorMode(16385L),
-      ColorLoopActive(16386L),
-      ColorLoopDirection(16387L),
-      ColorLoopTime(16388L),
-      ColorLoopStartEnhancedHue(16389L),
-      ColorLoopStoredEnhancedHue(16390L),
-      ColorCapabilities(16394L),
-      ColorTempPhysicalMinMireds(16395L),
-      ColorTempPhysicalMaxMireds(16396L),
-      CoupleColorTempToLevelMinMireds(16397L),
-      StartUpColorTemperatureMireds(16400L),
-      GeneratedCommandList(65528L),
-      AcceptedCommandList(65529L),
-      EventList(65530L),
-      AttributeList(65531L),
-      FeatureMap(65532L),
-      ClusterRevision(65533L),
+    public enum UnlockWithTimeoutCommandField {
+      Timeout(0),
+      PINCode(1),
       ;
-      private final long id;
+      private final int id;
 
-      Attribute(long id) {
+      UnlockWithTimeoutCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Attribute value(long id) throws NoSuchFieldError {
-        for (Attribute attribute : Attribute.values()) {
-          if (attribute.getID() == id) {
-            return attribute;
+      public static UnlockWithTimeoutCommandField value(int id) throws NoSuchFieldError {
+        for (UnlockWithTimeoutCommandField field : UnlockWithTimeoutCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
       }
     }
 
-    public enum Event {
+    public enum SetWeekDayScheduleCommandField {
+      WeekDayIndex(0),
+      UserIndex(1),
+      DaysMask(2),
+      StartHour(3),
+      StartMinute(4),
+      EndHour(5),
+      EndMinute(6),
       ;
-      private final long id;
+      private final int id;
 
-      Event(long id) {
+      SetWeekDayScheduleCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Event value(long id) throws NoSuchFieldError {
-        for (Event event : Event.values()) {
-          if (event.getID() == id) {
-            return event;
+      public static SetWeekDayScheduleCommandField value(int id) throws NoSuchFieldError {
+        for (SetWeekDayScheduleCommandField field : SetWeekDayScheduleCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
       }
     }
 
-    public enum Command {
-      MoveToHue(0L),
-      MoveHue(1L),
-      StepHue(2L),
-      MoveToSaturation(3L),
-      MoveSaturation(4L),
-      StepSaturation(5L),
-      MoveToHueAndSaturation(6L),
-      MoveToColor(7L),
-      MoveColor(8L),
-      StepColor(9L),
-      MoveToColorTemperature(10L),
-      EnhancedMoveToHue(64L),
-      EnhancedMoveHue(65L),
-      EnhancedStepHue(66L),
-      EnhancedMoveToHueAndSaturation(67L),
-      ColorLoopSet(68L),
-      StopMoveStep(71L),
-      MoveColorTemperature(75L),
-      StepColorTemperature(76L),
+    public enum GetWeekDayScheduleCommandField {
+      WeekDayIndex(0),
+      UserIndex(1),
       ;
-      private final long id;
+      private final int id;
 
-      Command(long id) {
+      GetWeekDayScheduleCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Command value(long id) throws NoSuchFieldError {
-        for (Command command : Command.values()) {
-          if (command.getID() == id) {
-            return command;
+      public static GetWeekDayScheduleCommandField value(int id) throws NoSuchFieldError {
+        for (GetWeekDayScheduleCommandField field : GetWeekDayScheduleCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
       }
     }
 
-    @Override
-    public String getAttributeName(long id) throws NoSuchFieldError {
-      return Attribute.value(id).toString();
-    }
+    public enum ClearWeekDayScheduleCommandField {
+      WeekDayIndex(0),
+      UserIndex(1),
+      ;
+      private final int id;
 
-    @Override
-    public String getEventName(long id) throws NoSuchFieldError {
-      return Event.value(id).toString();
-    }
+      ClearWeekDayScheduleCommandField(int id) {
+        this.id = id;
+      }
 
-    @Override
-    public String getCommandName(long id) throws NoSuchFieldError {
-      return Command.value(id).toString();
+      public int getID() {
+        return id;
+      }
+
+      public static ClearWeekDayScheduleCommandField value(int id) throws NoSuchFieldError {
+        for (ClearWeekDayScheduleCommandField field : ClearWeekDayScheduleCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
     }
 
-    @Override
-    public long getAttributeID(String name) throws IllegalArgumentException {
-      return Attribute.valueOf(name).getID();
-    }
+    public enum SetYearDayScheduleCommandField {
+      YearDayIndex(0),
+      UserIndex(1),
+      LocalStartTime(2),
+      LocalEndTime(3),
+      ;
+      private final int id;
 
-    @Override
-    public long getEventID(String name) throws IllegalArgumentException {
-      return Event.valueOf(name).getID();
-    }
+      SetYearDayScheduleCommandField(int id) {
+        this.id = id;
+      }
 
-    @Override
-    public long getCommandID(String name) throws IllegalArgumentException {
-      return Command.valueOf(name).getID();
+      public int getID() {
+        return id;
+      }
+
+      public static SetYearDayScheduleCommandField value(int id) throws NoSuchFieldError {
+        for (SetYearDayScheduleCommandField field : SetYearDayScheduleCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
     }
-  }
 
-  public static class BallastConfiguration implements BaseCluster {
-    public static final long ID = 769L;
+    public enum GetYearDayScheduleCommandField {
+      YearDayIndex(0),
+      UserIndex(1),
+      ;
+      private final int id;
 
-    public long getID() {
-      return ID;
+      GetYearDayScheduleCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static GetYearDayScheduleCommandField value(int id) throws NoSuchFieldError {
+        for (GetYearDayScheduleCommandField field : GetYearDayScheduleCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
     }
 
-    public enum Attribute {
-      PhysicalMinLevel(0L),
-      PhysicalMaxLevel(1L),
-      BallastStatus(2L),
-      MinLevel(16L),
-      MaxLevel(17L),
-      IntrinsicBallastFactor(20L),
-      BallastFactorAdjustment(21L),
-      LampQuantity(32L),
-      LampType(48L),
-      LampManufacturer(49L),
-      LampRatedHours(50L),
-      LampBurnHours(51L),
-      LampAlarmMode(52L),
-      LampBurnHoursTripPoint(53L),
-      GeneratedCommandList(65528L),
-      AcceptedCommandList(65529L),
-      EventList(65530L),
-      AttributeList(65531L),
-      FeatureMap(65532L),
-      ClusterRevision(65533L),
+    public enum ClearYearDayScheduleCommandField {
+      YearDayIndex(0),
+      UserIndex(1),
       ;
-      private final long id;
+      private final int id;
 
-      Attribute(long id) {
+      ClearYearDayScheduleCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Attribute value(long id) throws NoSuchFieldError {
-        for (Attribute attribute : Attribute.values()) {
-          if (attribute.getID() == id) {
-            return attribute;
+      public static ClearYearDayScheduleCommandField value(int id) throws NoSuchFieldError {
+        for (ClearYearDayScheduleCommandField field : ClearYearDayScheduleCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
       }
     }
 
-    public enum Event {
+    public enum SetHolidayScheduleCommandField {
+      HolidayIndex(0),
+      LocalStartTime(1),
+      LocalEndTime(2),
+      OperatingMode(3),
       ;
-      private final long id;
+      private final int id;
 
-      Event(long id) {
+      SetHolidayScheduleCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Event value(long id) throws NoSuchFieldError {
-        for (Event event : Event.values()) {
-          if (event.getID() == id) {
-            return event;
+      public static SetHolidayScheduleCommandField value(int id) throws NoSuchFieldError {
+        for (SetHolidayScheduleCommandField field : SetHolidayScheduleCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
       }
     }
 
-    public enum Command {
+    public enum GetHolidayScheduleCommandField {
+      HolidayIndex(0),
       ;
-      private final long id;
+      private final int id;
 
-      Command(long id) {
+      GetHolidayScheduleCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Command value(long id) throws NoSuchFieldError {
-        for (Command command : Command.values()) {
-          if (command.getID() == id) {
-            return command;
+      public static GetHolidayScheduleCommandField value(int id) throws NoSuchFieldError {
+        for (GetHolidayScheduleCommandField field : GetHolidayScheduleCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
       }
     }
 
-    @Override
-    public String getAttributeName(long id) throws NoSuchFieldError {
-      return Attribute.value(id).toString();
-    }
+    public enum ClearHolidayScheduleCommandField {
+      HolidayIndex(0),
+      ;
+      private final int id;
 
-    @Override
-    public String getEventName(long id) throws NoSuchFieldError {
-      return Event.value(id).toString();
-    }
+      ClearHolidayScheduleCommandField(int id) {
+        this.id = id;
+      }
 
-    @Override
-    public String getCommandName(long id) throws NoSuchFieldError {
-      return Command.value(id).toString();
+      public int getID() {
+        return id;
+      }
+
+      public static ClearHolidayScheduleCommandField value(int id) throws NoSuchFieldError {
+        for (ClearHolidayScheduleCommandField field : ClearHolidayScheduleCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
     }
 
-    @Override
-    public long getAttributeID(String name) throws IllegalArgumentException {
-      return Attribute.valueOf(name).getID();
+    public enum SetUserCommandField {
+      OperationType(0),
+      UserIndex(1),
+      UserName(2),
+      UserUniqueID(3),
+      UserStatus(4),
+      UserType(5),
+      CredentialRule(6),
+      ;
+      private final int id;
+
+      SetUserCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static SetUserCommandField value(int id) throws NoSuchFieldError {
+        for (SetUserCommandField field : SetUserCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
     }
 
-    @Override
-    public long getEventID(String name) throws IllegalArgumentException {
-      return Event.valueOf(name).getID();
+    public enum GetUserCommandField {
+      UserIndex(0),
+      ;
+      private final int id;
+
+      GetUserCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static GetUserCommandField value(int id) throws NoSuchFieldError {
+        for (GetUserCommandField field : GetUserCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
     }
 
-    @Override
-    public long getCommandID(String name) throws IllegalArgumentException {
-      return Command.valueOf(name).getID();
+    public enum ClearUserCommandField {
+      UserIndex(0),
+      ;
+      private final int id;
+
+      ClearUserCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static ClearUserCommandField value(int id) throws NoSuchFieldError {
+        for (ClearUserCommandField field : ClearUserCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
     }
-  }
 
-  public static class IlluminanceMeasurement implements BaseCluster {
-    public static final long ID = 1024L;
+    public enum SetCredentialCommandField {
+      OperationType(0),
+      Credential(1),
+      CredentialData(2),
+      UserIndex(3),
+      UserStatus(4),
+      UserType(5),
+      ;
+      private final int id;
 
-    public long getID() {
-      return ID;
+      SetCredentialCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static SetCredentialCommandField value(int id) throws NoSuchFieldError {
+        for (SetCredentialCommandField field : SetCredentialCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
     }
 
-    public enum Attribute {
-      MeasuredValue(0L),
-      MinMeasuredValue(1L),
-      MaxMeasuredValue(2L),
-      Tolerance(3L),
-      LightSensorType(4L),
-      GeneratedCommandList(65528L),
-      AcceptedCommandList(65529L),
-      EventList(65530L),
-      AttributeList(65531L),
-      FeatureMap(65532L),
-      ClusterRevision(65533L),
+    public enum GetCredentialStatusCommandField {
+      Credential(0),
       ;
-      private final long id;
+      private final int id;
 
-      Attribute(long id) {
+      GetCredentialStatusCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Attribute value(long id) throws NoSuchFieldError {
-        for (Attribute attribute : Attribute.values()) {
-          if (attribute.getID() == id) {
-            return attribute;
+      public static GetCredentialStatusCommandField value(int id) throws NoSuchFieldError {
+        for (GetCredentialStatusCommandField field : GetCredentialStatusCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
       }
     }
 
-    public enum Event {
+    public enum ClearCredentialCommandField {
+      Credential(0),
       ;
-      private final long id;
+      private final int id;
 
-      Event(long id) {
+      ClearCredentialCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Event value(long id) throws NoSuchFieldError {
-        for (Event event : Event.values()) {
-          if (event.getID() == id) {
-            return event;
+      public static ClearCredentialCommandField value(int id) throws NoSuchFieldError {
+        for (ClearCredentialCommandField field : ClearCredentialCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
       }
     }
 
-    public enum Command {
+    public enum UnboltDoorCommandField {
+      PINCode(0),
       ;
-      private final long id;
+      private final int id;
 
-      Command(long id) {
+      UnboltDoorCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Command value(long id) throws NoSuchFieldError {
-        for (Command command : Command.values()) {
-          if (command.getID() == id) {
-            return command;
+      public static UnboltDoorCommandField value(int id) throws NoSuchFieldError {
+        for (UnboltDoorCommandField field : UnboltDoorCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
@@ -8592,18 +9743,36 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class TemperatureMeasurement implements BaseCluster {
-    public static final long ID = 1026L;
+  public static class WindowCovering implements BaseCluster {
+    public static final long ID = 258L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      MeasuredValue(0L),
-      MinMeasuredValue(1L),
-      MaxMeasuredValue(2L),
-      Tolerance(3L),
+      Type(0L),
+      PhysicalClosedLimitLift(1L),
+      PhysicalClosedLimitTilt(2L),
+      CurrentPositionLift(3L),
+      CurrentPositionTilt(4L),
+      NumberOfActuationsLift(5L),
+      NumberOfActuationsTilt(6L),
+      ConfigStatus(7L),
+      CurrentPositionLiftPercentage(8L),
+      CurrentPositionTiltPercentage(9L),
+      OperationalStatus(10L),
+      TargetPositionLiftPercent100ths(11L),
+      TargetPositionTiltPercent100ths(12L),
+      EndProductType(13L),
+      CurrentPositionLiftPercent100ths(14L),
+      CurrentPositionTiltPercent100ths(15L),
+      InstalledOpenLimitLift(16L),
+      InstalledClosedLimitLift(17L),
+      InstalledOpenLimitTilt(18L),
+      InstalledClosedLimitTilt(19L),
+      Mode(23L),
+      SafetyStatus(26L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -8654,6 +9823,13 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
+      UpOrOpen(0L),
+      DownOrClose(1L),
+      StopMotion(2L),
+      GoToLiftValue(4L),
+      GoToLiftPercentage(5L),
+      GoToTiltValue(7L),
+      GoToTiltPercentage(8L),
       ;
       private final long id;
 
@@ -8675,119 +9851,92 @@ public static Command value(long id) throws NoSuchFieldError {
       }
     }
 
-    @Override
-    public String getAttributeName(long id) throws NoSuchFieldError {
-      return Attribute.value(id).toString();
-    }
+    public enum GoToLiftValueCommandField {
+      LiftValue(0),
+      ;
+      private final int id;
 
-    @Override
-    public String getEventName(long id) throws NoSuchFieldError {
-      return Event.value(id).toString();
-    }
+      GoToLiftValueCommandField(int id) {
+        this.id = id;
+      }
 
-    @Override
-    public String getCommandName(long id) throws NoSuchFieldError {
-      return Command.value(id).toString();
+      public int getID() {
+        return id;
+      }
+
+      public static GoToLiftValueCommandField value(int id) throws NoSuchFieldError {
+        for (GoToLiftValueCommandField field : GoToLiftValueCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
     }
 
-    @Override
-    public long getAttributeID(String name) throws IllegalArgumentException {
-      return Attribute.valueOf(name).getID();
-    }
-
-    @Override
-    public long getEventID(String name) throws IllegalArgumentException {
-      return Event.valueOf(name).getID();
-    }
-
-    @Override
-    public long getCommandID(String name) throws IllegalArgumentException {
-      return Command.valueOf(name).getID();
-    }
-  }
-
-  public static class PressureMeasurement implements BaseCluster {
-    public static final long ID = 1027L;
-
-    public long getID() {
-      return ID;
-    }
-
-    public enum Attribute {
-      MeasuredValue(0L),
-      MinMeasuredValue(1L),
-      MaxMeasuredValue(2L),
-      Tolerance(3L),
-      ScaledValue(16L),
-      MinScaledValue(17L),
-      MaxScaledValue(18L),
-      ScaledTolerance(19L),
-      Scale(20L),
-      GeneratedCommandList(65528L),
-      AcceptedCommandList(65529L),
-      EventList(65530L),
-      AttributeList(65531L),
-      FeatureMap(65532L),
-      ClusterRevision(65533L),
+    public enum GoToLiftPercentageCommandField {
+      LiftPercent100thsValue(0),
       ;
-      private final long id;
+      private final int id;
 
-      Attribute(long id) {
+      GoToLiftPercentageCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Attribute value(long id) throws NoSuchFieldError {
-        for (Attribute attribute : Attribute.values()) {
-          if (attribute.getID() == id) {
-            return attribute;
+      public static GoToLiftPercentageCommandField value(int id) throws NoSuchFieldError {
+        for (GoToLiftPercentageCommandField field : GoToLiftPercentageCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
       }
     }
 
-    public enum Event {
+    public enum GoToTiltValueCommandField {
+      TiltValue(0),
       ;
-      private final long id;
+      private final int id;
 
-      Event(long id) {
+      GoToTiltValueCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Event value(long id) throws NoSuchFieldError {
-        for (Event event : Event.values()) {
-          if (event.getID() == id) {
-            return event;
+      public static GoToTiltValueCommandField value(int id) throws NoSuchFieldError {
+        for (GoToTiltValueCommandField field : GoToTiltValueCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
       }
     }
 
-    public enum Command {
+    public enum GoToTiltPercentageCommandField {
+      TiltPercent100thsValue(0),
       ;
-      private final long id;
+      private final int id;
 
-      Command(long id) {
+      GoToTiltPercentageCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Command value(long id) throws NoSuchFieldError {
-        for (Command command : Command.values()) {
-          if (command.getID() == id) {
-            return command;
+      public static GoToTiltPercentageCommandField value(int id) throws NoSuchFieldError {
+        for (GoToTiltPercentageCommandField field : GoToTiltPercentageCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
@@ -8825,18 +9974,24 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class FlowMeasurement implements BaseCluster {
-    public static final long ID = 1028L;
+  public static class BarrierControl implements BaseCluster {
+    public static final long ID = 259L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      MeasuredValue(0L),
-      MinMeasuredValue(1L),
-      MaxMeasuredValue(2L),
-      Tolerance(3L),
+      BarrierMovingState(1L),
+      BarrierSafetyStatus(2L),
+      BarrierCapabilities(3L),
+      BarrierOpenEvents(4L),
+      BarrierCloseEvents(5L),
+      BarrierCommandOpenEvents(6L),
+      BarrierCommandCloseEvents(7L),
+      BarrierOpenPeriod(8L),
+      BarrierClosePeriod(9L),
+      BarrierPosition(10L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -8887,6 +10042,8 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
+      BarrierControlGoToPercent(0L),
+      BarrierControlStop(1L),
       ;
       private final long id;
 
@@ -8908,6 +10065,30 @@ public static Command value(long id) throws NoSuchFieldError {
       }
     }
 
+    public enum BarrierControlGoToPercentCommandField {
+      PercentOpen(0),
+      ;
+      private final int id;
+
+      BarrierControlGoToPercentCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static BarrierControlGoToPercentCommandField value(int id) throws NoSuchFieldError {
+        for (BarrierControlGoToPercentCommandField field :
+            BarrierControlGoToPercentCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
     @Override
     public String getAttributeName(long id) throws NoSuchFieldError {
       return Attribute.value(id).toString();
@@ -8939,18 +10120,37 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class RelativeHumidityMeasurement implements BaseCluster {
-    public static final long ID = 1029L;
+  public static class PumpConfigurationAndControl implements BaseCluster {
+    public static final long ID = 512L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      MeasuredValue(0L),
-      MinMeasuredValue(1L),
-      MaxMeasuredValue(2L),
-      Tolerance(3L),
+      MaxPressure(0L),
+      MaxSpeed(1L),
+      MaxFlow(2L),
+      MinConstPressure(3L),
+      MaxConstPressure(4L),
+      MinCompPressure(5L),
+      MaxCompPressure(6L),
+      MinConstSpeed(7L),
+      MaxConstSpeed(8L),
+      MinConstFlow(9L),
+      MaxConstFlow(10L),
+      MinConstTemp(11L),
+      MaxConstTemp(12L),
+      PumpStatus(16L),
+      EffectiveOperationMode(17L),
+      EffectiveControlMode(18L),
+      Capacity(19L),
+      Speed(20L),
+      LifetimeRunningHours(21L),
+      Power(22L),
+      LifetimeEnergyConsumed(23L),
+      OperationMode(32L),
+      ControlMode(33L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -8979,6 +10179,23 @@ public static Attribute value(long id) throws NoSuchFieldError {
     }
 
     public enum Event {
+      SupplyVoltageLow(0L),
+      SupplyVoltageHigh(1L),
+      PowerMissingPhase(2L),
+      SystemPressureLow(3L),
+      SystemPressureHigh(4L),
+      DryRunning(5L),
+      MotorTemperatureHigh(6L),
+      PumpMotorFatalFailure(7L),
+      ElectronicTemperatureHigh(8L),
+      PumpBlocked(9L),
+      SensorFailure(10L),
+      ElectronicNonFatalFailure(11L),
+      ElectronicFatalFailure(12L),
+      GeneralFault(13L),
+      Leakage(14L),
+      AirDetection(15L),
+      TurbineOperation(16L),
       ;
       private final long id;
 
@@ -9053,26 +10270,63 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class OccupancySensing implements BaseCluster {
-    public static final long ID = 1030L;
+  public static class Thermostat implements BaseCluster {
+    public static final long ID = 513L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      Occupancy(0L),
-      OccupancySensorType(1L),
-      OccupancySensorTypeBitmap(2L),
-      PIROccupiedToUnoccupiedDelay(16L),
-      PIRUnoccupiedToOccupiedDelay(17L),
-      PIRUnoccupiedToOccupiedThreshold(18L),
-      UltrasonicOccupiedToUnoccupiedDelay(32L),
-      UltrasonicUnoccupiedToOccupiedDelay(33L),
-      UltrasonicUnoccupiedToOccupiedThreshold(34L),
-      PhysicalContactOccupiedToUnoccupiedDelay(48L),
-      PhysicalContactUnoccupiedToOccupiedDelay(49L),
-      PhysicalContactUnoccupiedToOccupiedThreshold(50L),
+      LocalTemperature(0L),
+      OutdoorTemperature(1L),
+      Occupancy(2L),
+      AbsMinHeatSetpointLimit(3L),
+      AbsMaxHeatSetpointLimit(4L),
+      AbsMinCoolSetpointLimit(5L),
+      AbsMaxCoolSetpointLimit(6L),
+      PICoolingDemand(7L),
+      PIHeatingDemand(8L),
+      HVACSystemTypeConfiguration(9L),
+      LocalTemperatureCalibration(16L),
+      OccupiedCoolingSetpoint(17L),
+      OccupiedHeatingSetpoint(18L),
+      UnoccupiedCoolingSetpoint(19L),
+      UnoccupiedHeatingSetpoint(20L),
+      MinHeatSetpointLimit(21L),
+      MaxHeatSetpointLimit(22L),
+      MinCoolSetpointLimit(23L),
+      MaxCoolSetpointLimit(24L),
+      MinSetpointDeadBand(25L),
+      RemoteSensing(26L),
+      ControlSequenceOfOperation(27L),
+      SystemMode(28L),
+      ThermostatRunningMode(30L),
+      StartOfWeek(32L),
+      NumberOfWeeklyTransitions(33L),
+      NumberOfDailyTransitions(34L),
+      TemperatureSetpointHold(35L),
+      TemperatureSetpointHoldDuration(36L),
+      ThermostatProgrammingOperationMode(37L),
+      ThermostatRunningState(41L),
+      SetpointChangeSource(48L),
+      SetpointChangeAmount(49L),
+      SetpointChangeSourceTimestamp(50L),
+      OccupiedSetback(52L),
+      OccupiedSetbackMin(53L),
+      OccupiedSetbackMax(54L),
+      UnoccupiedSetback(55L),
+      UnoccupiedSetbackMin(56L),
+      UnoccupiedSetbackMax(57L),
+      EmergencyHeatDelta(58L),
+      ACType(64L),
+      ACCapacity(65L),
+      ACRefrigerantType(66L),
+      ACCompressorType(67L),
+      ACErrorCode(68L),
+      ACLouverPosition(69L),
+      ACCoilTemperature(70L),
+      ACCapacityformat(71L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -9123,6 +10377,10 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
+      SetpointRaiseLower(0L),
+      SetWeeklySchedule(1L),
+      GetWeeklySchedule(2L),
+      ClearWeeklySchedule(3L),
       ;
       private final long id;
 
@@ -9144,6 +10402,80 @@ public static Command value(long id) throws NoSuchFieldError {
       }
     }
 
+    public enum SetpointRaiseLowerCommandField {
+      Mode(0),
+      Amount(1),
+      ;
+      private final int id;
+
+      SetpointRaiseLowerCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static SetpointRaiseLowerCommandField value(int id) throws NoSuchFieldError {
+        for (SetpointRaiseLowerCommandField field : SetpointRaiseLowerCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum SetWeeklyScheduleCommandField {
+      NumberOfTransitionsForSequence(0),
+      DayOfWeekForSequence(1),
+      ModeForSequence(2),
+      Transitions(3),
+      ;
+      private final int id;
+
+      SetWeeklyScheduleCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static SetWeeklyScheduleCommandField value(int id) throws NoSuchFieldError {
+        for (SetWeeklyScheduleCommandField field : SetWeeklyScheduleCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum GetWeeklyScheduleCommandField {
+      DaysToReturn(0),
+      ModeToReturn(1),
+      ;
+      private final int id;
+
+      GetWeeklyScheduleCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static GetWeeklyScheduleCommandField value(int id) throws NoSuchFieldError {
+        for (GetWeeklyScheduleCommandField field : GetWeeklyScheduleCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
     @Override
     public String getAttributeName(long id) throws NoSuchFieldError {
       return Attribute.value(id).toString();
@@ -9175,15 +10507,25 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class WakeOnLan implements BaseCluster {
-    public static final long ID = 1283L;
+  public static class FanControl implements BaseCluster {
+    public static final long ID = 514L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      MACAddress(0L),
+      FanMode(0L),
+      FanModeSequence(1L),
+      PercentSetting(2L),
+      PercentCurrent(3L),
+      SpeedMax(4L),
+      SpeedSetting(5L),
+      SpeedCurrent(6L),
+      RockSupport(7L),
+      RockSetting(8L),
+      WindSupport(9L),
+      WindSetting(10L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -9286,17 +10628,17 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class Channel implements BaseCluster {
-    public static final long ID = 1284L;
+  public static class ThermostatUserInterfaceConfiguration implements BaseCluster {
+    public static final long ID = 516L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      ChannelList(0L),
-      Lineup(1L),
-      CurrentChannel(2L),
+      TemperatureDisplayMode(0L),
+      KeypadLockout(1L),
+      ScheduleProgrammingVisibility(2L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -9347,9 +10689,6 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
-      ChangeChannel(0L),
-      ChangeChannelByNumber(2L),
-      SkipChannel(3L),
       ;
       private final long id;
 
@@ -9402,16 +10741,66 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class TargetNavigator implements BaseCluster {
-    public static final long ID = 1285L;
+  public static class ColorControl implements BaseCluster {
+    public static final long ID = 768L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      TargetList(0L),
-      CurrentTarget(1L),
+      CurrentHue(0L),
+      CurrentSaturation(1L),
+      RemainingTime(2L),
+      CurrentX(3L),
+      CurrentY(4L),
+      DriftCompensation(5L),
+      CompensationText(6L),
+      ColorTemperatureMireds(7L),
+      ColorMode(8L),
+      Options(15L),
+      NumberOfPrimaries(16L),
+      Primary1X(17L),
+      Primary1Y(18L),
+      Primary1Intensity(19L),
+      Primary2X(21L),
+      Primary2Y(22L),
+      Primary2Intensity(23L),
+      Primary3X(25L),
+      Primary3Y(26L),
+      Primary3Intensity(27L),
+      Primary4X(32L),
+      Primary4Y(33L),
+      Primary4Intensity(34L),
+      Primary5X(36L),
+      Primary5Y(37L),
+      Primary5Intensity(38L),
+      Primary6X(40L),
+      Primary6Y(41L),
+      Primary6Intensity(42L),
+      WhitePointX(48L),
+      WhitePointY(49L),
+      ColorPointRX(50L),
+      ColorPointRY(51L),
+      ColorPointRIntensity(52L),
+      ColorPointGX(54L),
+      ColorPointGY(55L),
+      ColorPointGIntensity(56L),
+      ColorPointBX(58L),
+      ColorPointBY(59L),
+      ColorPointBIntensity(60L),
+      EnhancedCurrentHue(16384L),
+      EnhancedColorMode(16385L),
+      ColorLoopActive(16386L),
+      ColorLoopDirection(16387L),
+      ColorLoopTime(16388L),
+      ColorLoopStartEnhancedHue(16389L),
+      ColorLoopStoredEnhancedHue(16390L),
+      ColorCapabilities(16394L),
+      ColorTempPhysicalMinMireds(16395L),
+      ColorTempPhysicalMaxMireds(16396L),
+      CoupleColorTempToLevelMinMireds(16397L),
+      StartUpColorTemperatureMireds(16400L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -9462,7 +10851,25 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
-      NavigateTarget(0L),
+      MoveToHue(0L),
+      MoveHue(1L),
+      StepHue(2L),
+      MoveToSaturation(3L),
+      MoveSaturation(4L),
+      StepSaturation(5L),
+      MoveToHueAndSaturation(6L),
+      MoveToColor(7L),
+      MoveColor(8L),
+      StepColor(9L),
+      MoveToColorTemperature(10L),
+      EnhancedMoveToHue(64L),
+      EnhancedMoveHue(65L),
+      EnhancedStepHue(66L),
+      EnhancedMoveToHueAndSaturation(67L),
+      ColorLoopSet(68L),
+      StopMoveStep(71L),
+      MoveColorTemperature(75L),
+      StepColorTemperature(76L),
       ;
       private final long id;
 
@@ -9484,355 +10891,513 @@ public static Command value(long id) throws NoSuchFieldError {
       }
     }
 
-    @Override
-    public String getAttributeName(long id) throws NoSuchFieldError {
-      return Attribute.value(id).toString();
-    }
-
-    @Override
-    public String getEventName(long id) throws NoSuchFieldError {
-      return Event.value(id).toString();
-    }
-
-    @Override
-    public String getCommandName(long id) throws NoSuchFieldError {
-      return Command.value(id).toString();
-    }
-
-    @Override
-    public long getAttributeID(String name) throws IllegalArgumentException {
-      return Attribute.valueOf(name).getID();
-    }
-
-    @Override
-    public long getEventID(String name) throws IllegalArgumentException {
-      return Event.valueOf(name).getID();
-    }
-
-    @Override
-    public long getCommandID(String name) throws IllegalArgumentException {
-      return Command.valueOf(name).getID();
-    }
-  }
-
-  public static class MediaPlayback implements BaseCluster {
-    public static final long ID = 1286L;
-
-    public long getID() {
-      return ID;
-    }
-
-    public enum Attribute {
-      CurrentState(0L),
-      StartTime(1L),
-      Duration(2L),
-      SampledPosition(3L),
-      PlaybackSpeed(4L),
-      SeekRangeEnd(5L),
-      SeekRangeStart(6L),
-      GeneratedCommandList(65528L),
-      AcceptedCommandList(65529L),
-      EventList(65530L),
-      AttributeList(65531L),
-      FeatureMap(65532L),
-      ClusterRevision(65533L),
+    public enum MoveToHueCommandField {
+      Hue(0),
+      Direction(1),
+      TransitionTime(2),
+      OptionsMask(3),
+      OptionsOverride(4),
       ;
-      private final long id;
+      private final int id;
 
-      Attribute(long id) {
+      MoveToHueCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Attribute value(long id) throws NoSuchFieldError {
-        for (Attribute attribute : Attribute.values()) {
-          if (attribute.getID() == id) {
-            return attribute;
+      public static MoveToHueCommandField value(int id) throws NoSuchFieldError {
+        for (MoveToHueCommandField field : MoveToHueCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
       }
     }
 
-    public enum Event {
+    public enum MoveHueCommandField {
+      MoveMode(0),
+      Rate(1),
+      OptionsMask(2),
+      OptionsOverride(3),
       ;
-      private final long id;
+      private final int id;
 
-      Event(long id) {
+      MoveHueCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Event value(long id) throws NoSuchFieldError {
-        for (Event event : Event.values()) {
-          if (event.getID() == id) {
-            return event;
+      public static MoveHueCommandField value(int id) throws NoSuchFieldError {
+        for (MoveHueCommandField field : MoveHueCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
       }
     }
 
-    public enum Command {
-      Play(0L),
-      Pause(1L),
-      Stop(2L),
-      StartOver(3L),
-      Previous(4L),
-      Next(5L),
-      Rewind(6L),
-      FastForward(7L),
-      SkipForward(8L),
-      SkipBackward(9L),
-      Seek(11L),
+    public enum StepHueCommandField {
+      StepMode(0),
+      StepSize(1),
+      TransitionTime(2),
+      OptionsMask(3),
+      OptionsOverride(4),
       ;
-      private final long id;
+      private final int id;
 
-      Command(long id) {
+      StepHueCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Command value(long id) throws NoSuchFieldError {
-        for (Command command : Command.values()) {
-          if (command.getID() == id) {
-            return command;
+      public static StepHueCommandField value(int id) throws NoSuchFieldError {
+        for (StepHueCommandField field : StepHueCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
       }
     }
 
-    @Override
-    public String getAttributeName(long id) throws NoSuchFieldError {
-      return Attribute.value(id).toString();
-    }
-
-    @Override
-    public String getEventName(long id) throws NoSuchFieldError {
-      return Event.value(id).toString();
-    }
-
-    @Override
-    public String getCommandName(long id) throws NoSuchFieldError {
-      return Command.value(id).toString();
-    }
-
-    @Override
-    public long getAttributeID(String name) throws IllegalArgumentException {
-      return Attribute.valueOf(name).getID();
-    }
-
-    @Override
-    public long getEventID(String name) throws IllegalArgumentException {
-      return Event.valueOf(name).getID();
-    }
-
-    @Override
-    public long getCommandID(String name) throws IllegalArgumentException {
-      return Command.valueOf(name).getID();
-    }
-  }
-
-  public static class MediaInput implements BaseCluster {
-    public static final long ID = 1287L;
-
-    public long getID() {
-      return ID;
-    }
-
-    public enum Attribute {
-      InputList(0L),
-      CurrentInput(1L),
-      GeneratedCommandList(65528L),
-      AcceptedCommandList(65529L),
-      EventList(65530L),
-      AttributeList(65531L),
-      FeatureMap(65532L),
-      ClusterRevision(65533L),
+    public enum MoveToSaturationCommandField {
+      Saturation(0),
+      TransitionTime(1),
+      OptionsMask(2),
+      OptionsOverride(3),
       ;
-      private final long id;
+      private final int id;
 
-      Attribute(long id) {
+      MoveToSaturationCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Attribute value(long id) throws NoSuchFieldError {
-        for (Attribute attribute : Attribute.values()) {
-          if (attribute.getID() == id) {
-            return attribute;
+      public static MoveToSaturationCommandField value(int id) throws NoSuchFieldError {
+        for (MoveToSaturationCommandField field : MoveToSaturationCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
       }
     }
 
-    public enum Event {
+    public enum MoveSaturationCommandField {
+      MoveMode(0),
+      Rate(1),
+      OptionsMask(2),
+      OptionsOverride(3),
       ;
-      private final long id;
+      private final int id;
 
-      Event(long id) {
+      MoveSaturationCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Event value(long id) throws NoSuchFieldError {
-        for (Event event : Event.values()) {
-          if (event.getID() == id) {
-            return event;
+      public static MoveSaturationCommandField value(int id) throws NoSuchFieldError {
+        for (MoveSaturationCommandField field : MoveSaturationCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
       }
     }
 
-    public enum Command {
-      SelectInput(0L),
-      ShowInputStatus(1L),
-      HideInputStatus(2L),
-      RenameInput(3L),
+    public enum StepSaturationCommandField {
+      StepMode(0),
+      StepSize(1),
+      TransitionTime(2),
+      OptionsMask(3),
+      OptionsOverride(4),
       ;
-      private final long id;
+      private final int id;
 
-      Command(long id) {
+      StepSaturationCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Command value(long id) throws NoSuchFieldError {
-        for (Command command : Command.values()) {
-          if (command.getID() == id) {
-            return command;
+      public static StepSaturationCommandField value(int id) throws NoSuchFieldError {
+        for (StepSaturationCommandField field : StepSaturationCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
       }
     }
 
-    @Override
-    public String getAttributeName(long id) throws NoSuchFieldError {
-      return Attribute.value(id).toString();
+    public enum MoveToHueAndSaturationCommandField {
+      Hue(0),
+      Saturation(1),
+      TransitionTime(2),
+      OptionsMask(3),
+      OptionsOverride(4),
+      ;
+      private final int id;
+
+      MoveToHueAndSaturationCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static MoveToHueAndSaturationCommandField value(int id) throws NoSuchFieldError {
+        for (MoveToHueAndSaturationCommandField field :
+            MoveToHueAndSaturationCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
     }
 
-    @Override
-    public String getEventName(long id) throws NoSuchFieldError {
-      return Event.value(id).toString();
+    public enum MoveToColorCommandField {
+      ColorX(0),
+      ColorY(1),
+      TransitionTime(2),
+      OptionsMask(3),
+      OptionsOverride(4),
+      ;
+      private final int id;
+
+      MoveToColorCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static MoveToColorCommandField value(int id) throws NoSuchFieldError {
+        for (MoveToColorCommandField field : MoveToColorCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
     }
 
-    @Override
-    public String getCommandName(long id) throws NoSuchFieldError {
-      return Command.value(id).toString();
+    public enum MoveColorCommandField {
+      RateX(0),
+      RateY(1),
+      OptionsMask(2),
+      OptionsOverride(3),
+      ;
+      private final int id;
+
+      MoveColorCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static MoveColorCommandField value(int id) throws NoSuchFieldError {
+        for (MoveColorCommandField field : MoveColorCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
     }
 
-    @Override
-    public long getAttributeID(String name) throws IllegalArgumentException {
-      return Attribute.valueOf(name).getID();
+    public enum StepColorCommandField {
+      StepX(0),
+      StepY(1),
+      TransitionTime(2),
+      OptionsMask(3),
+      OptionsOverride(4),
+      ;
+      private final int id;
+
+      StepColorCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static StepColorCommandField value(int id) throws NoSuchFieldError {
+        for (StepColorCommandField field : StepColorCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
     }
 
-    @Override
-    public long getEventID(String name) throws IllegalArgumentException {
-      return Event.valueOf(name).getID();
+    public enum MoveToColorTemperatureCommandField {
+      ColorTemperatureMireds(0),
+      TransitionTime(1),
+      OptionsMask(2),
+      OptionsOverride(3),
+      ;
+      private final int id;
+
+      MoveToColorTemperatureCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static MoveToColorTemperatureCommandField value(int id) throws NoSuchFieldError {
+        for (MoveToColorTemperatureCommandField field :
+            MoveToColorTemperatureCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
     }
 
-    @Override
-    public long getCommandID(String name) throws IllegalArgumentException {
-      return Command.valueOf(name).getID();
+    public enum EnhancedMoveToHueCommandField {
+      EnhancedHue(0),
+      Direction(1),
+      TransitionTime(2),
+      OptionsMask(3),
+      OptionsOverride(4),
+      ;
+      private final int id;
+
+      EnhancedMoveToHueCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static EnhancedMoveToHueCommandField value(int id) throws NoSuchFieldError {
+        for (EnhancedMoveToHueCommandField field : EnhancedMoveToHueCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
     }
-  }
 
-  public static class LowPower implements BaseCluster {
-    public static final long ID = 1288L;
+    public enum EnhancedMoveHueCommandField {
+      MoveMode(0),
+      Rate(1),
+      OptionsMask(2),
+      OptionsOverride(3),
+      ;
+      private final int id;
 
-    public long getID() {
-      return ID;
+      EnhancedMoveHueCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static EnhancedMoveHueCommandField value(int id) throws NoSuchFieldError {
+        for (EnhancedMoveHueCommandField field : EnhancedMoveHueCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
     }
 
-    public enum Attribute {
-      GeneratedCommandList(65528L),
-      AcceptedCommandList(65529L),
-      EventList(65530L),
-      AttributeList(65531L),
-      FeatureMap(65532L),
-      ClusterRevision(65533L),
+    public enum EnhancedStepHueCommandField {
+      StepMode(0),
+      StepSize(1),
+      TransitionTime(2),
+      OptionsMask(3),
+      OptionsOverride(4),
       ;
-      private final long id;
+      private final int id;
 
-      Attribute(long id) {
+      EnhancedStepHueCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Attribute value(long id) throws NoSuchFieldError {
-        for (Attribute attribute : Attribute.values()) {
-          if (attribute.getID() == id) {
-            return attribute;
+      public static EnhancedStepHueCommandField value(int id) throws NoSuchFieldError {
+        for (EnhancedStepHueCommandField field : EnhancedStepHueCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
       }
     }
 
-    public enum Event {
+    public enum EnhancedMoveToHueAndSaturationCommandField {
+      EnhancedHue(0),
+      Saturation(1),
+      TransitionTime(2),
+      OptionsMask(3),
+      OptionsOverride(4),
       ;
-      private final long id;
+      private final int id;
 
-      Event(long id) {
+      EnhancedMoveToHueAndSaturationCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Event value(long id) throws NoSuchFieldError {
-        for (Event event : Event.values()) {
-          if (event.getID() == id) {
-            return event;
+      public static EnhancedMoveToHueAndSaturationCommandField value(int id)
+          throws NoSuchFieldError {
+        for (EnhancedMoveToHueAndSaturationCommandField field :
+            EnhancedMoveToHueAndSaturationCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
       }
     }
 
-    public enum Command {
-      Sleep(0L),
+    public enum ColorLoopSetCommandField {
+      UpdateFlags(0),
+      Action(1),
+      Direction(2),
+      Time(3),
+      StartHue(4),
+      OptionsMask(5),
+      OptionsOverride(6),
       ;
-      private final long id;
+      private final int id;
 
-      Command(long id) {
+      ColorLoopSetCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Command value(long id) throws NoSuchFieldError {
-        for (Command command : Command.values()) {
-          if (command.getID() == id) {
-            return command;
+      public static ColorLoopSetCommandField value(int id) throws NoSuchFieldError {
+        for (ColorLoopSetCommandField field : ColorLoopSetCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum StopMoveStepCommandField {
+      OptionsMask(0),
+      OptionsOverride(1),
+      ;
+      private final int id;
+
+      StopMoveStepCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static StopMoveStepCommandField value(int id) throws NoSuchFieldError {
+        for (StopMoveStepCommandField field : StopMoveStepCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum MoveColorTemperatureCommandField {
+      MoveMode(0),
+      Rate(1),
+      ColorTemperatureMinimumMireds(2),
+      ColorTemperatureMaximumMireds(3),
+      OptionsMask(4),
+      OptionsOverride(5),
+      ;
+      private final int id;
+
+      MoveColorTemperatureCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static MoveColorTemperatureCommandField value(int id) throws NoSuchFieldError {
+        for (MoveColorTemperatureCommandField field : MoveColorTemperatureCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum StepColorTemperatureCommandField {
+      StepMode(0),
+      StepSize(1),
+      TransitionTime(2),
+      ColorTemperatureMinimumMireds(3),
+      ColorTemperatureMaximumMireds(4),
+      OptionsMask(5),
+      OptionsOverride(6),
+      ;
+      private final int id;
+
+      StepColorTemperatureCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static StepColorTemperatureCommandField value(int id) throws NoSuchFieldError {
+        for (StepColorTemperatureCommandField field : StepColorTemperatureCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
@@ -9870,14 +11435,28 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class KeypadInput implements BaseCluster {
-    public static final long ID = 1289L;
+  public static class BallastConfiguration implements BaseCluster {
+    public static final long ID = 769L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
+      PhysicalMinLevel(0L),
+      PhysicalMaxLevel(1L),
+      BallastStatus(2L),
+      MinLevel(16L),
+      MaxLevel(17L),
+      IntrinsicBallastFactor(20L),
+      BallastFactorAdjustment(21L),
+      LampQuantity(32L),
+      LampType(48L),
+      LampManufacturer(49L),
+      LampRatedHours(50L),
+      LampBurnHours(51L),
+      LampAlarmMode(52L),
+      LampBurnHoursTripPoint(53L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -9928,7 +11507,6 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
-      SendKey(0L),
       ;
       private final long id;
 
@@ -9981,16 +11559,19 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class ContentLauncher implements BaseCluster {
-    public static final long ID = 1290L;
+  public static class IlluminanceMeasurement implements BaseCluster {
+    public static final long ID = 1024L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      AcceptHeader(0L),
-      SupportedStreamingProtocols(1L),
+      MeasuredValue(0L),
+      MinMeasuredValue(1L),
+      MaxMeasuredValue(2L),
+      Tolerance(3L),
+      LightSensorType(4L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -10041,8 +11622,6 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
-      LaunchContent(0L),
-      LaunchURL(1L),
       ;
       private final long id;
 
@@ -10095,16 +11674,18 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class AudioOutput implements BaseCluster {
-    public static final long ID = 1291L;
+  public static class TemperatureMeasurement implements BaseCluster {
+    public static final long ID = 1026L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      OutputList(0L),
-      CurrentOutput(1L),
+      MeasuredValue(0L),
+      MinMeasuredValue(1L),
+      MaxMeasuredValue(2L),
+      Tolerance(3L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -10155,8 +11736,6 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
-      SelectOutput(0L),
-      RenameOutput(1L),
       ;
       private final long id;
 
@@ -10209,16 +11788,23 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class ApplicationLauncher implements BaseCluster {
-    public static final long ID = 1292L;
+  public static class PressureMeasurement implements BaseCluster {
+    public static final long ID = 1027L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      CatalogList(0L),
-      CurrentApp(1L),
+      MeasuredValue(0L),
+      MinMeasuredValue(1L),
+      MaxMeasuredValue(2L),
+      Tolerance(3L),
+      ScaledValue(16L),
+      MinScaledValue(17L),
+      MaxScaledValue(18L),
+      ScaledTolerance(19L),
+      Scale(20L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -10269,9 +11855,6 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
-      LaunchApp(0L),
-      StopApp(1L),
-      HideApp(2L),
       ;
       private final long id;
 
@@ -10324,22 +11907,18 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class ApplicationBasic implements BaseCluster {
-    public static final long ID = 1293L;
+  public static class FlowMeasurement implements BaseCluster {
+    public static final long ID = 1028L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      VendorName(0L),
-      VendorID(1L),
-      ApplicationName(2L),
-      ProductID(3L),
-      Application(4L),
-      Status(5L),
-      ApplicationVersion(6L),
-      AllowedVendorList(7L),
+      MeasuredValue(0L),
+      MinMeasuredValue(1L),
+      MaxMeasuredValue(2L),
+      Tolerance(3L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -10442,14 +12021,18 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class AccountLogin implements BaseCluster {
-    public static final long ID = 1294L;
+  public static class RelativeHumidityMeasurement implements BaseCluster {
+    public static final long ID = 1029L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
+      MeasuredValue(0L),
+      MinMeasuredValue(1L),
+      MaxMeasuredValue(2L),
+      Tolerance(3L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -10500,9 +12083,6 @@ public static Event value(long id) throws NoSuchFieldError {
     }
 
     public enum Command {
-      GetSetupPIN(0L),
-      Login(2L),
-      Logout(3L),
       ;
       private final long id;
 
@@ -10555,142 +12135,26 @@ public long getCommandID(String name) throws IllegalArgumentException {
     }
   }
 
-  public static class ElectricalMeasurement implements BaseCluster {
-    public static final long ID = 2820L;
+  public static class OccupancySensing implements BaseCluster {
+    public static final long ID = 1030L;
 
     public long getID() {
       return ID;
     }
 
     public enum Attribute {
-      MeasurementType(0L),
-      DcVoltage(256L),
-      DcVoltageMin(257L),
-      DcVoltageMax(258L),
-      DcCurrent(259L),
-      DcCurrentMin(260L),
-      DcCurrentMax(261L),
-      DcPower(262L),
-      DcPowerMin(263L),
-      DcPowerMax(264L),
-      DcVoltageMultiplier(512L),
-      DcVoltageDivisor(513L),
-      DcCurrentMultiplier(514L),
-      DcCurrentDivisor(515L),
-      DcPowerMultiplier(516L),
-      DcPowerDivisor(517L),
-      AcFrequency(768L),
-      AcFrequencyMin(769L),
-      AcFrequencyMax(770L),
-      NeutralCurrent(771L),
-      TotalActivePower(772L),
-      TotalReactivePower(773L),
-      TotalApparentPower(774L),
-      Measured1stHarmonicCurrent(775L),
-      Measured3rdHarmonicCurrent(776L),
-      Measured5thHarmonicCurrent(777L),
-      Measured7thHarmonicCurrent(778L),
-      Measured9thHarmonicCurrent(779L),
-      Measured11thHarmonicCurrent(780L),
-      MeasuredPhase1stHarmonicCurrent(781L),
-      MeasuredPhase3rdHarmonicCurrent(782L),
-      MeasuredPhase5thHarmonicCurrent(783L),
-      MeasuredPhase7thHarmonicCurrent(784L),
-      MeasuredPhase9thHarmonicCurrent(785L),
-      MeasuredPhase11thHarmonicCurrent(786L),
-      AcFrequencyMultiplier(1024L),
-      AcFrequencyDivisor(1025L),
-      PowerMultiplier(1026L),
-      PowerDivisor(1027L),
-      HarmonicCurrentMultiplier(1028L),
-      PhaseHarmonicCurrentMultiplier(1029L),
-      InstantaneousVoltage(1280L),
-      InstantaneousLineCurrent(1281L),
-      InstantaneousActiveCurrent(1282L),
-      InstantaneousReactiveCurrent(1283L),
-      InstantaneousPower(1284L),
-      RmsVoltage(1285L),
-      RmsVoltageMin(1286L),
-      RmsVoltageMax(1287L),
-      RmsCurrent(1288L),
-      RmsCurrentMin(1289L),
-      RmsCurrentMax(1290L),
-      ActivePower(1291L),
-      ActivePowerMin(1292L),
-      ActivePowerMax(1293L),
-      ReactivePower(1294L),
-      ApparentPower(1295L),
-      PowerFactor(1296L),
-      AverageRmsVoltageMeasurementPeriod(1297L),
-      AverageRmsUnderVoltageCounter(1299L),
-      RmsExtremeOverVoltagePeriod(1300L),
-      RmsExtremeUnderVoltagePeriod(1301L),
-      RmsVoltageSagPeriod(1302L),
-      RmsVoltageSwellPeriod(1303L),
-      AcVoltageMultiplier(1536L),
-      AcVoltageDivisor(1537L),
-      AcCurrentMultiplier(1538L),
-      AcCurrentDivisor(1539L),
-      AcPowerMultiplier(1540L),
-      AcPowerDivisor(1541L),
-      OverloadAlarmsMask(1792L),
-      VoltageOverload(1793L),
-      CurrentOverload(1794L),
-      AcOverloadAlarmsMask(2048L),
-      AcVoltageOverload(2049L),
-      AcCurrentOverload(2050L),
-      AcActivePowerOverload(2051L),
-      AcReactivePowerOverload(2052L),
-      AverageRmsOverVoltage(2053L),
-      AverageRmsUnderVoltage(2054L),
-      RmsExtremeOverVoltage(2055L),
-      RmsExtremeUnderVoltage(2056L),
-      RmsVoltageSag(2057L),
-      RmsVoltageSwell(2058L),
-      LineCurrentPhaseB(2305L),
-      ActiveCurrentPhaseB(2306L),
-      ReactiveCurrentPhaseB(2307L),
-      RmsVoltagePhaseB(2309L),
-      RmsVoltageMinPhaseB(2310L),
-      RmsVoltageMaxPhaseB(2311L),
-      RmsCurrentPhaseB(2312L),
-      RmsCurrentMinPhaseB(2313L),
-      RmsCurrentMaxPhaseB(2314L),
-      ActivePowerPhaseB(2315L),
-      ActivePowerMinPhaseB(2316L),
-      ActivePowerMaxPhaseB(2317L),
-      ReactivePowerPhaseB(2318L),
-      ApparentPowerPhaseB(2319L),
-      PowerFactorPhaseB(2320L),
-      AverageRmsVoltageMeasurementPeriodPhaseB(2321L),
-      AverageRmsOverVoltageCounterPhaseB(2322L),
-      AverageRmsUnderVoltageCounterPhaseB(2323L),
-      RmsExtremeOverVoltagePeriodPhaseB(2324L),
-      RmsExtremeUnderVoltagePeriodPhaseB(2325L),
-      RmsVoltageSagPeriodPhaseB(2326L),
-      RmsVoltageSwellPeriodPhaseB(2327L),
-      LineCurrentPhaseC(2561L),
-      ActiveCurrentPhaseC(2562L),
-      ReactiveCurrentPhaseC(2563L),
-      RmsVoltagePhaseC(2565L),
-      RmsVoltageMinPhaseC(2566L),
-      RmsVoltageMaxPhaseC(2567L),
-      RmsCurrentPhaseC(2568L),
-      RmsCurrentMinPhaseC(2569L),
-      RmsCurrentMaxPhaseC(2570L),
-      ActivePowerPhaseC(2571L),
-      ActivePowerMinPhaseC(2572L),
-      ActivePowerMaxPhaseC(2573L),
-      ReactivePowerPhaseC(2574L),
-      ApparentPowerPhaseC(2575L),
-      PowerFactorPhaseC(2576L),
-      AverageRmsVoltageMeasurementPeriodPhaseC(2577L),
-      AverageRmsOverVoltageCounterPhaseC(2578L),
-      AverageRmsUnderVoltageCounterPhaseC(2579L),
-      RmsExtremeOverVoltagePeriodPhaseC(2580L),
-      RmsExtremeUnderVoltagePeriodPhaseC(2581L),
-      RmsVoltageSagPeriodPhaseC(2582L),
-      RmsVoltageSwellPeriodPhaseC(2583L),
+      Occupancy(0L),
+      OccupancySensorType(1L),
+      OccupancySensorTypeBitmap(2L),
+      PIROccupiedToUnoccupiedDelay(16L),
+      PIRUnoccupiedToOccupiedDelay(17L),
+      PIRUnoccupiedToOccupiedThreshold(18L),
+      UltrasonicOccupiedToUnoccupiedDelay(32L),
+      UltrasonicUnoccupiedToOccupiedDelay(33L),
+      UltrasonicUnoccupiedToOccupiedThreshold(34L),
+      PhysicalContactOccupiedToUnoccupiedDelay(48L),
+      PhysicalContactUnoccupiedToOccupiedDelay(49L),
+      PhysicalContactUnoccupiedToOccupiedThreshold(50L),
       GeneratedCommandList(65528L),
       AcceptedCommandList(65529L),
       EventList(65530L),
@@ -10698,282 +12162,2807 @@ public enum Attribute {
       FeatureMap(65532L),
       ClusterRevision(65533L),
       ;
-      private final long id;
+      private final long id;
+
+      Attribute(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Attribute value(long id) throws NoSuchFieldError {
+        for (Attribute attribute : Attribute.values()) {
+          if (attribute.getID() == id) {
+            return attribute;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum Event {
+      ;
+      private final long id;
+
+      Event(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Event value(long id) throws NoSuchFieldError {
+        for (Event event : Event.values()) {
+          if (event.getID() == id) {
+            return event;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum Command {
+      ;
+      private final long id;
+
+      Command(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Command value(long id) throws NoSuchFieldError {
+        for (Command command : Command.values()) {
+          if (command.getID() == id) {
+            return command;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    @Override
+    public String getAttributeName(long id) throws NoSuchFieldError {
+      return Attribute.value(id).toString();
+    }
+
+    @Override
+    public String getEventName(long id) throws NoSuchFieldError {
+      return Event.value(id).toString();
+    }
+
+    @Override
+    public String getCommandName(long id) throws NoSuchFieldError {
+      return Command.value(id).toString();
+    }
+
+    @Override
+    public long getAttributeID(String name) throws IllegalArgumentException {
+      return Attribute.valueOf(name).getID();
+    }
+
+    @Override
+    public long getEventID(String name) throws IllegalArgumentException {
+      return Event.valueOf(name).getID();
+    }
+
+    @Override
+    public long getCommandID(String name) throws IllegalArgumentException {
+      return Command.valueOf(name).getID();
+    }
+  }
+
+  public static class WakeOnLan implements BaseCluster {
+    public static final long ID = 1283L;
+
+    public long getID() {
+      return ID;
+    }
+
+    public enum Attribute {
+      MACAddress(0L),
+      GeneratedCommandList(65528L),
+      AcceptedCommandList(65529L),
+      EventList(65530L),
+      AttributeList(65531L),
+      FeatureMap(65532L),
+      ClusterRevision(65533L),
+      ;
+      private final long id;
+
+      Attribute(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Attribute value(long id) throws NoSuchFieldError {
+        for (Attribute attribute : Attribute.values()) {
+          if (attribute.getID() == id) {
+            return attribute;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum Event {
+      ;
+      private final long id;
+
+      Event(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Event value(long id) throws NoSuchFieldError {
+        for (Event event : Event.values()) {
+          if (event.getID() == id) {
+            return event;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum Command {
+      ;
+      private final long id;
+
+      Command(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Command value(long id) throws NoSuchFieldError {
+        for (Command command : Command.values()) {
+          if (command.getID() == id) {
+            return command;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    @Override
+    public String getAttributeName(long id) throws NoSuchFieldError {
+      return Attribute.value(id).toString();
+    }
+
+    @Override
+    public String getEventName(long id) throws NoSuchFieldError {
+      return Event.value(id).toString();
+    }
+
+    @Override
+    public String getCommandName(long id) throws NoSuchFieldError {
+      return Command.value(id).toString();
+    }
+
+    @Override
+    public long getAttributeID(String name) throws IllegalArgumentException {
+      return Attribute.valueOf(name).getID();
+    }
+
+    @Override
+    public long getEventID(String name) throws IllegalArgumentException {
+      return Event.valueOf(name).getID();
+    }
+
+    @Override
+    public long getCommandID(String name) throws IllegalArgumentException {
+      return Command.valueOf(name).getID();
+    }
+  }
+
+  public static class Channel implements BaseCluster {
+    public static final long ID = 1284L;
+
+    public long getID() {
+      return ID;
+    }
+
+    public enum Attribute {
+      ChannelList(0L),
+      Lineup(1L),
+      CurrentChannel(2L),
+      GeneratedCommandList(65528L),
+      AcceptedCommandList(65529L),
+      EventList(65530L),
+      AttributeList(65531L),
+      FeatureMap(65532L),
+      ClusterRevision(65533L),
+      ;
+      private final long id;
+
+      Attribute(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Attribute value(long id) throws NoSuchFieldError {
+        for (Attribute attribute : Attribute.values()) {
+          if (attribute.getID() == id) {
+            return attribute;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum Event {
+      ;
+      private final long id;
+
+      Event(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Event value(long id) throws NoSuchFieldError {
+        for (Event event : Event.values()) {
+          if (event.getID() == id) {
+            return event;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum Command {
+      ChangeChannel(0L),
+      ChangeChannelByNumber(2L),
+      SkipChannel(3L),
+      ;
+      private final long id;
+
+      Command(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Command value(long id) throws NoSuchFieldError {
+        for (Command command : Command.values()) {
+          if (command.getID() == id) {
+            return command;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum ChangeChannelCommandField {
+      Match(0),
+      ;
+      private final int id;
+
+      ChangeChannelCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static ChangeChannelCommandField value(int id) throws NoSuchFieldError {
+        for (ChangeChannelCommandField field : ChangeChannelCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum ChangeChannelByNumberCommandField {
+      MajorNumber(0),
+      MinorNumber(1),
+      ;
+      private final int id;
+
+      ChangeChannelByNumberCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static ChangeChannelByNumberCommandField value(int id) throws NoSuchFieldError {
+        for (ChangeChannelByNumberCommandField field : ChangeChannelByNumberCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum SkipChannelCommandField {
+      Count(0),
+      ;
+      private final int id;
+
+      SkipChannelCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static SkipChannelCommandField value(int id) throws NoSuchFieldError {
+        for (SkipChannelCommandField field : SkipChannelCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    @Override
+    public String getAttributeName(long id) throws NoSuchFieldError {
+      return Attribute.value(id).toString();
+    }
+
+    @Override
+    public String getEventName(long id) throws NoSuchFieldError {
+      return Event.value(id).toString();
+    }
+
+    @Override
+    public String getCommandName(long id) throws NoSuchFieldError {
+      return Command.value(id).toString();
+    }
+
+    @Override
+    public long getAttributeID(String name) throws IllegalArgumentException {
+      return Attribute.valueOf(name).getID();
+    }
+
+    @Override
+    public long getEventID(String name) throws IllegalArgumentException {
+      return Event.valueOf(name).getID();
+    }
+
+    @Override
+    public long getCommandID(String name) throws IllegalArgumentException {
+      return Command.valueOf(name).getID();
+    }
+  }
+
+  public static class TargetNavigator implements BaseCluster {
+    public static final long ID = 1285L;
+
+    public long getID() {
+      return ID;
+    }
+
+    public enum Attribute {
+      TargetList(0L),
+      CurrentTarget(1L),
+      GeneratedCommandList(65528L),
+      AcceptedCommandList(65529L),
+      EventList(65530L),
+      AttributeList(65531L),
+      FeatureMap(65532L),
+      ClusterRevision(65533L),
+      ;
+      private final long id;
+
+      Attribute(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Attribute value(long id) throws NoSuchFieldError {
+        for (Attribute attribute : Attribute.values()) {
+          if (attribute.getID() == id) {
+            return attribute;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum Event {
+      ;
+      private final long id;
+
+      Event(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Event value(long id) throws NoSuchFieldError {
+        for (Event event : Event.values()) {
+          if (event.getID() == id) {
+            return event;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum Command {
+      NavigateTarget(0L),
+      ;
+      private final long id;
+
+      Command(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Command value(long id) throws NoSuchFieldError {
+        for (Command command : Command.values()) {
+          if (command.getID() == id) {
+            return command;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum NavigateTargetCommandField {
+      Target(0),
+      Data(1),
+      ;
+      private final int id;
+
+      NavigateTargetCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static NavigateTargetCommandField value(int id) throws NoSuchFieldError {
+        for (NavigateTargetCommandField field : NavigateTargetCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    @Override
+    public String getAttributeName(long id) throws NoSuchFieldError {
+      return Attribute.value(id).toString();
+    }
+
+    @Override
+    public String getEventName(long id) throws NoSuchFieldError {
+      return Event.value(id).toString();
+    }
+
+    @Override
+    public String getCommandName(long id) throws NoSuchFieldError {
+      return Command.value(id).toString();
+    }
+
+    @Override
+    public long getAttributeID(String name) throws IllegalArgumentException {
+      return Attribute.valueOf(name).getID();
+    }
+
+    @Override
+    public long getEventID(String name) throws IllegalArgumentException {
+      return Event.valueOf(name).getID();
+    }
+
+    @Override
+    public long getCommandID(String name) throws IllegalArgumentException {
+      return Command.valueOf(name).getID();
+    }
+  }
+
+  public static class MediaPlayback implements BaseCluster {
+    public static final long ID = 1286L;
+
+    public long getID() {
+      return ID;
+    }
+
+    public enum Attribute {
+      CurrentState(0L),
+      StartTime(1L),
+      Duration(2L),
+      SampledPosition(3L),
+      PlaybackSpeed(4L),
+      SeekRangeEnd(5L),
+      SeekRangeStart(6L),
+      GeneratedCommandList(65528L),
+      AcceptedCommandList(65529L),
+      EventList(65530L),
+      AttributeList(65531L),
+      FeatureMap(65532L),
+      ClusterRevision(65533L),
+      ;
+      private final long id;
+
+      Attribute(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Attribute value(long id) throws NoSuchFieldError {
+        for (Attribute attribute : Attribute.values()) {
+          if (attribute.getID() == id) {
+            return attribute;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum Event {
+      ;
+      private final long id;
+
+      Event(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Event value(long id) throws NoSuchFieldError {
+        for (Event event : Event.values()) {
+          if (event.getID() == id) {
+            return event;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum Command {
+      Play(0L),
+      Pause(1L),
+      Stop(2L),
+      StartOver(3L),
+      Previous(4L),
+      Next(5L),
+      Rewind(6L),
+      FastForward(7L),
+      SkipForward(8L),
+      SkipBackward(9L),
+      Seek(11L),
+      ;
+      private final long id;
+
+      Command(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Command value(long id) throws NoSuchFieldError {
+        for (Command command : Command.values()) {
+          if (command.getID() == id) {
+            return command;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum SkipForwardCommandField {
+      DeltaPositionMilliseconds(0),
+      ;
+      private final int id;
+
+      SkipForwardCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static SkipForwardCommandField value(int id) throws NoSuchFieldError {
+        for (SkipForwardCommandField field : SkipForwardCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum SkipBackwardCommandField {
+      DeltaPositionMilliseconds(0),
+      ;
+      private final int id;
+
+      SkipBackwardCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static SkipBackwardCommandField value(int id) throws NoSuchFieldError {
+        for (SkipBackwardCommandField field : SkipBackwardCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum SeekCommandField {
+      Position(0),
+      ;
+      private final int id;
+
+      SeekCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static SeekCommandField value(int id) throws NoSuchFieldError {
+        for (SeekCommandField field : SeekCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    @Override
+    public String getAttributeName(long id) throws NoSuchFieldError {
+      return Attribute.value(id).toString();
+    }
+
+    @Override
+    public String getEventName(long id) throws NoSuchFieldError {
+      return Event.value(id).toString();
+    }
+
+    @Override
+    public String getCommandName(long id) throws NoSuchFieldError {
+      return Command.value(id).toString();
+    }
+
+    @Override
+    public long getAttributeID(String name) throws IllegalArgumentException {
+      return Attribute.valueOf(name).getID();
+    }
+
+    @Override
+    public long getEventID(String name) throws IllegalArgumentException {
+      return Event.valueOf(name).getID();
+    }
+
+    @Override
+    public long getCommandID(String name) throws IllegalArgumentException {
+      return Command.valueOf(name).getID();
+    }
+  }
+
+  public static class MediaInput implements BaseCluster {
+    public static final long ID = 1287L;
+
+    public long getID() {
+      return ID;
+    }
+
+    public enum Attribute {
+      InputList(0L),
+      CurrentInput(1L),
+      GeneratedCommandList(65528L),
+      AcceptedCommandList(65529L),
+      EventList(65530L),
+      AttributeList(65531L),
+      FeatureMap(65532L),
+      ClusterRevision(65533L),
+      ;
+      private final long id;
+
+      Attribute(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Attribute value(long id) throws NoSuchFieldError {
+        for (Attribute attribute : Attribute.values()) {
+          if (attribute.getID() == id) {
+            return attribute;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum Event {
+      ;
+      private final long id;
+
+      Event(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Event value(long id) throws NoSuchFieldError {
+        for (Event event : Event.values()) {
+          if (event.getID() == id) {
+            return event;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum Command {
+      SelectInput(0L),
+      ShowInputStatus(1L),
+      HideInputStatus(2L),
+      RenameInput(3L),
+      ;
+      private final long id;
+
+      Command(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Command value(long id) throws NoSuchFieldError {
+        for (Command command : Command.values()) {
+          if (command.getID() == id) {
+            return command;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum SelectInputCommandField {
+      Index(0),
+      ;
+      private final int id;
+
+      SelectInputCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static SelectInputCommandField value(int id) throws NoSuchFieldError {
+        for (SelectInputCommandField field : SelectInputCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum RenameInputCommandField {
+      Index(0),
+      Name(1),
+      ;
+      private final int id;
+
+      RenameInputCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static RenameInputCommandField value(int id) throws NoSuchFieldError {
+        for (RenameInputCommandField field : RenameInputCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    @Override
+    public String getAttributeName(long id) throws NoSuchFieldError {
+      return Attribute.value(id).toString();
+    }
+
+    @Override
+    public String getEventName(long id) throws NoSuchFieldError {
+      return Event.value(id).toString();
+    }
+
+    @Override
+    public String getCommandName(long id) throws NoSuchFieldError {
+      return Command.value(id).toString();
+    }
+
+    @Override
+    public long getAttributeID(String name) throws IllegalArgumentException {
+      return Attribute.valueOf(name).getID();
+    }
+
+    @Override
+    public long getEventID(String name) throws IllegalArgumentException {
+      return Event.valueOf(name).getID();
+    }
+
+    @Override
+    public long getCommandID(String name) throws IllegalArgumentException {
+      return Command.valueOf(name).getID();
+    }
+  }
+
+  public static class LowPower implements BaseCluster {
+    public static final long ID = 1288L;
+
+    public long getID() {
+      return ID;
+    }
+
+    public enum Attribute {
+      GeneratedCommandList(65528L),
+      AcceptedCommandList(65529L),
+      EventList(65530L),
+      AttributeList(65531L),
+      FeatureMap(65532L),
+      ClusterRevision(65533L),
+      ;
+      private final long id;
+
+      Attribute(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Attribute value(long id) throws NoSuchFieldError {
+        for (Attribute attribute : Attribute.values()) {
+          if (attribute.getID() == id) {
+            return attribute;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum Event {
+      ;
+      private final long id;
+
+      Event(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Event value(long id) throws NoSuchFieldError {
+        for (Event event : Event.values()) {
+          if (event.getID() == id) {
+            return event;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum Command {
+      Sleep(0L),
+      ;
+      private final long id;
+
+      Command(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Command value(long id) throws NoSuchFieldError {
+        for (Command command : Command.values()) {
+          if (command.getID() == id) {
+            return command;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    @Override
+    public String getAttributeName(long id) throws NoSuchFieldError {
+      return Attribute.value(id).toString();
+    }
+
+    @Override
+    public String getEventName(long id) throws NoSuchFieldError {
+      return Event.value(id).toString();
+    }
+
+    @Override
+    public String getCommandName(long id) throws NoSuchFieldError {
+      return Command.value(id).toString();
+    }
+
+    @Override
+    public long getAttributeID(String name) throws IllegalArgumentException {
+      return Attribute.valueOf(name).getID();
+    }
+
+    @Override
+    public long getEventID(String name) throws IllegalArgumentException {
+      return Event.valueOf(name).getID();
+    }
+
+    @Override
+    public long getCommandID(String name) throws IllegalArgumentException {
+      return Command.valueOf(name).getID();
+    }
+  }
+
+  public static class KeypadInput implements BaseCluster {
+    public static final long ID = 1289L;
+
+    public long getID() {
+      return ID;
+    }
+
+    public enum Attribute {
+      GeneratedCommandList(65528L),
+      AcceptedCommandList(65529L),
+      EventList(65530L),
+      AttributeList(65531L),
+      FeatureMap(65532L),
+      ClusterRevision(65533L),
+      ;
+      private final long id;
+
+      Attribute(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Attribute value(long id) throws NoSuchFieldError {
+        for (Attribute attribute : Attribute.values()) {
+          if (attribute.getID() == id) {
+            return attribute;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum Event {
+      ;
+      private final long id;
+
+      Event(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Event value(long id) throws NoSuchFieldError {
+        for (Event event : Event.values()) {
+          if (event.getID() == id) {
+            return event;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum Command {
+      SendKey(0L),
+      ;
+      private final long id;
+
+      Command(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Command value(long id) throws NoSuchFieldError {
+        for (Command command : Command.values()) {
+          if (command.getID() == id) {
+            return command;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum SendKeyCommandField {
+      KeyCode(0),
+      ;
+      private final int id;
+
+      SendKeyCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static SendKeyCommandField value(int id) throws NoSuchFieldError {
+        for (SendKeyCommandField field : SendKeyCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    @Override
+    public String getAttributeName(long id) throws NoSuchFieldError {
+      return Attribute.value(id).toString();
+    }
+
+    @Override
+    public String getEventName(long id) throws NoSuchFieldError {
+      return Event.value(id).toString();
+    }
+
+    @Override
+    public String getCommandName(long id) throws NoSuchFieldError {
+      return Command.value(id).toString();
+    }
+
+    @Override
+    public long getAttributeID(String name) throws IllegalArgumentException {
+      return Attribute.valueOf(name).getID();
+    }
+
+    @Override
+    public long getEventID(String name) throws IllegalArgumentException {
+      return Event.valueOf(name).getID();
+    }
+
+    @Override
+    public long getCommandID(String name) throws IllegalArgumentException {
+      return Command.valueOf(name).getID();
+    }
+  }
+
+  public static class ContentLauncher implements BaseCluster {
+    public static final long ID = 1290L;
+
+    public long getID() {
+      return ID;
+    }
+
+    public enum Attribute {
+      AcceptHeader(0L),
+      SupportedStreamingProtocols(1L),
+      GeneratedCommandList(65528L),
+      AcceptedCommandList(65529L),
+      EventList(65530L),
+      AttributeList(65531L),
+      FeatureMap(65532L),
+      ClusterRevision(65533L),
+      ;
+      private final long id;
+
+      Attribute(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Attribute value(long id) throws NoSuchFieldError {
+        for (Attribute attribute : Attribute.values()) {
+          if (attribute.getID() == id) {
+            return attribute;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum Event {
+      ;
+      private final long id;
+
+      Event(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Event value(long id) throws NoSuchFieldError {
+        for (Event event : Event.values()) {
+          if (event.getID() == id) {
+            return event;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum Command {
+      LaunchContent(0L),
+      LaunchURL(1L),
+      ;
+      private final long id;
+
+      Command(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Command value(long id) throws NoSuchFieldError {
+        for (Command command : Command.values()) {
+          if (command.getID() == id) {
+            return command;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum LaunchContentCommandField {
+      Search(0),
+      AutoPlay(1),
+      Data(2),
+      ;
+      private final int id;
+
+      LaunchContentCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static LaunchContentCommandField value(int id) throws NoSuchFieldError {
+        for (LaunchContentCommandField field : LaunchContentCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum LaunchURLCommandField {
+      ContentURL(0),
+      DisplayString(1),
+      BrandingInformation(2),
+      ;
+      private final int id;
+
+      LaunchURLCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static LaunchURLCommandField value(int id) throws NoSuchFieldError {
+        for (LaunchURLCommandField field : LaunchURLCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    @Override
+    public String getAttributeName(long id) throws NoSuchFieldError {
+      return Attribute.value(id).toString();
+    }
+
+    @Override
+    public String getEventName(long id) throws NoSuchFieldError {
+      return Event.value(id).toString();
+    }
+
+    @Override
+    public String getCommandName(long id) throws NoSuchFieldError {
+      return Command.value(id).toString();
+    }
+
+    @Override
+    public long getAttributeID(String name) throws IllegalArgumentException {
+      return Attribute.valueOf(name).getID();
+    }
+
+    @Override
+    public long getEventID(String name) throws IllegalArgumentException {
+      return Event.valueOf(name).getID();
+    }
+
+    @Override
+    public long getCommandID(String name) throws IllegalArgumentException {
+      return Command.valueOf(name).getID();
+    }
+  }
+
+  public static class AudioOutput implements BaseCluster {
+    public static final long ID = 1291L;
+
+    public long getID() {
+      return ID;
+    }
+
+    public enum Attribute {
+      OutputList(0L),
+      CurrentOutput(1L),
+      GeneratedCommandList(65528L),
+      AcceptedCommandList(65529L),
+      EventList(65530L),
+      AttributeList(65531L),
+      FeatureMap(65532L),
+      ClusterRevision(65533L),
+      ;
+      private final long id;
+
+      Attribute(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Attribute value(long id) throws NoSuchFieldError {
+        for (Attribute attribute : Attribute.values()) {
+          if (attribute.getID() == id) {
+            return attribute;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum Event {
+      ;
+      private final long id;
+
+      Event(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Event value(long id) throws NoSuchFieldError {
+        for (Event event : Event.values()) {
+          if (event.getID() == id) {
+            return event;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum Command {
+      SelectOutput(0L),
+      RenameOutput(1L),
+      ;
+      private final long id;
+
+      Command(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Command value(long id) throws NoSuchFieldError {
+        for (Command command : Command.values()) {
+          if (command.getID() == id) {
+            return command;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum SelectOutputCommandField {
+      Index(0),
+      ;
+      private final int id;
+
+      SelectOutputCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static SelectOutputCommandField value(int id) throws NoSuchFieldError {
+        for (SelectOutputCommandField field : SelectOutputCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum RenameOutputCommandField {
+      Index(0),
+      Name(1),
+      ;
+      private final int id;
+
+      RenameOutputCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static RenameOutputCommandField value(int id) throws NoSuchFieldError {
+        for (RenameOutputCommandField field : RenameOutputCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    @Override
+    public String getAttributeName(long id) throws NoSuchFieldError {
+      return Attribute.value(id).toString();
+    }
+
+    @Override
+    public String getEventName(long id) throws NoSuchFieldError {
+      return Event.value(id).toString();
+    }
+
+    @Override
+    public String getCommandName(long id) throws NoSuchFieldError {
+      return Command.value(id).toString();
+    }
+
+    @Override
+    public long getAttributeID(String name) throws IllegalArgumentException {
+      return Attribute.valueOf(name).getID();
+    }
+
+    @Override
+    public long getEventID(String name) throws IllegalArgumentException {
+      return Event.valueOf(name).getID();
+    }
+
+    @Override
+    public long getCommandID(String name) throws IllegalArgumentException {
+      return Command.valueOf(name).getID();
+    }
+  }
+
+  public static class ApplicationLauncher implements BaseCluster {
+    public static final long ID = 1292L;
+
+    public long getID() {
+      return ID;
+    }
+
+    public enum Attribute {
+      CatalogList(0L),
+      CurrentApp(1L),
+      GeneratedCommandList(65528L),
+      AcceptedCommandList(65529L),
+      EventList(65530L),
+      AttributeList(65531L),
+      FeatureMap(65532L),
+      ClusterRevision(65533L),
+      ;
+      private final long id;
+
+      Attribute(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Attribute value(long id) throws NoSuchFieldError {
+        for (Attribute attribute : Attribute.values()) {
+          if (attribute.getID() == id) {
+            return attribute;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum Event {
+      ;
+      private final long id;
+
+      Event(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Event value(long id) throws NoSuchFieldError {
+        for (Event event : Event.values()) {
+          if (event.getID() == id) {
+            return event;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum Command {
+      LaunchApp(0L),
+      StopApp(1L),
+      HideApp(2L),
+      ;
+      private final long id;
+
+      Command(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Command value(long id) throws NoSuchFieldError {
+        for (Command command : Command.values()) {
+          if (command.getID() == id) {
+            return command;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum LaunchAppCommandField {
+      Application(0),
+      Data(1),
+      ;
+      private final int id;
+
+      LaunchAppCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static LaunchAppCommandField value(int id) throws NoSuchFieldError {
+        for (LaunchAppCommandField field : LaunchAppCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum StopAppCommandField {
+      Application(0),
+      ;
+      private final int id;
+
+      StopAppCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static StopAppCommandField value(int id) throws NoSuchFieldError {
+        for (StopAppCommandField field : StopAppCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum HideAppCommandField {
+      Application(0),
+      ;
+      private final int id;
+
+      HideAppCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static HideAppCommandField value(int id) throws NoSuchFieldError {
+        for (HideAppCommandField field : HideAppCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    @Override
+    public String getAttributeName(long id) throws NoSuchFieldError {
+      return Attribute.value(id).toString();
+    }
+
+    @Override
+    public String getEventName(long id) throws NoSuchFieldError {
+      return Event.value(id).toString();
+    }
+
+    @Override
+    public String getCommandName(long id) throws NoSuchFieldError {
+      return Command.value(id).toString();
+    }
+
+    @Override
+    public long getAttributeID(String name) throws IllegalArgumentException {
+      return Attribute.valueOf(name).getID();
+    }
+
+    @Override
+    public long getEventID(String name) throws IllegalArgumentException {
+      return Event.valueOf(name).getID();
+    }
+
+    @Override
+    public long getCommandID(String name) throws IllegalArgumentException {
+      return Command.valueOf(name).getID();
+    }
+  }
+
+  public static class ApplicationBasic implements BaseCluster {
+    public static final long ID = 1293L;
+
+    public long getID() {
+      return ID;
+    }
+
+    public enum Attribute {
+      VendorName(0L),
+      VendorID(1L),
+      ApplicationName(2L),
+      ProductID(3L),
+      Application(4L),
+      Status(5L),
+      ApplicationVersion(6L),
+      AllowedVendorList(7L),
+      GeneratedCommandList(65528L),
+      AcceptedCommandList(65529L),
+      EventList(65530L),
+      AttributeList(65531L),
+      FeatureMap(65532L),
+      ClusterRevision(65533L),
+      ;
+      private final long id;
+
+      Attribute(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Attribute value(long id) throws NoSuchFieldError {
+        for (Attribute attribute : Attribute.values()) {
+          if (attribute.getID() == id) {
+            return attribute;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum Event {
+      ;
+      private final long id;
+
+      Event(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Event value(long id) throws NoSuchFieldError {
+        for (Event event : Event.values()) {
+          if (event.getID() == id) {
+            return event;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum Command {
+      ;
+      private final long id;
+
+      Command(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Command value(long id) throws NoSuchFieldError {
+        for (Command command : Command.values()) {
+          if (command.getID() == id) {
+            return command;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    @Override
+    public String getAttributeName(long id) throws NoSuchFieldError {
+      return Attribute.value(id).toString();
+    }
+
+    @Override
+    public String getEventName(long id) throws NoSuchFieldError {
+      return Event.value(id).toString();
+    }
+
+    @Override
+    public String getCommandName(long id) throws NoSuchFieldError {
+      return Command.value(id).toString();
+    }
+
+    @Override
+    public long getAttributeID(String name) throws IllegalArgumentException {
+      return Attribute.valueOf(name).getID();
+    }
+
+    @Override
+    public long getEventID(String name) throws IllegalArgumentException {
+      return Event.valueOf(name).getID();
+    }
+
+    @Override
+    public long getCommandID(String name) throws IllegalArgumentException {
+      return Command.valueOf(name).getID();
+    }
+  }
+
+  public static class AccountLogin implements BaseCluster {
+    public static final long ID = 1294L;
+
+    public long getID() {
+      return ID;
+    }
+
+    public enum Attribute {
+      GeneratedCommandList(65528L),
+      AcceptedCommandList(65529L),
+      EventList(65530L),
+      AttributeList(65531L),
+      FeatureMap(65532L),
+      ClusterRevision(65533L),
+      ;
+      private final long id;
+
+      Attribute(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Attribute value(long id) throws NoSuchFieldError {
+        for (Attribute attribute : Attribute.values()) {
+          if (attribute.getID() == id) {
+            return attribute;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum Event {
+      ;
+      private final long id;
+
+      Event(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Event value(long id) throws NoSuchFieldError {
+        for (Event event : Event.values()) {
+          if (event.getID() == id) {
+            return event;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum Command {
+      GetSetupPIN(0L),
+      Login(2L),
+      Logout(3L),
+      ;
+      private final long id;
+
+      Command(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Command value(long id) throws NoSuchFieldError {
+        for (Command command : Command.values()) {
+          if (command.getID() == id) {
+            return command;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum GetSetupPINCommandField {
+      TempAccountIdentifier(0),
+      ;
+      private final int id;
+
+      GetSetupPINCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static GetSetupPINCommandField value(int id) throws NoSuchFieldError {
+        for (GetSetupPINCommandField field : GetSetupPINCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum LoginCommandField {
+      TempAccountIdentifier(0),
+      SetupPIN(1),
+      ;
+      private final int id;
+
+      LoginCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static LoginCommandField value(int id) throws NoSuchFieldError {
+        for (LoginCommandField field : LoginCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    @Override
+    public String getAttributeName(long id) throws NoSuchFieldError {
+      return Attribute.value(id).toString();
+    }
+
+    @Override
+    public String getEventName(long id) throws NoSuchFieldError {
+      return Event.value(id).toString();
+    }
+
+    @Override
+    public String getCommandName(long id) throws NoSuchFieldError {
+      return Command.value(id).toString();
+    }
+
+    @Override
+    public long getAttributeID(String name) throws IllegalArgumentException {
+      return Attribute.valueOf(name).getID();
+    }
+
+    @Override
+    public long getEventID(String name) throws IllegalArgumentException {
+      return Event.valueOf(name).getID();
+    }
+
+    @Override
+    public long getCommandID(String name) throws IllegalArgumentException {
+      return Command.valueOf(name).getID();
+    }
+  }
+
+  public static class ElectricalMeasurement implements BaseCluster {
+    public static final long ID = 2820L;
+
+    public long getID() {
+      return ID;
+    }
+
+    public enum Attribute {
+      MeasurementType(0L),
+      DcVoltage(256L),
+      DcVoltageMin(257L),
+      DcVoltageMax(258L),
+      DcCurrent(259L),
+      DcCurrentMin(260L),
+      DcCurrentMax(261L),
+      DcPower(262L),
+      DcPowerMin(263L),
+      DcPowerMax(264L),
+      DcVoltageMultiplier(512L),
+      DcVoltageDivisor(513L),
+      DcCurrentMultiplier(514L),
+      DcCurrentDivisor(515L),
+      DcPowerMultiplier(516L),
+      DcPowerDivisor(517L),
+      AcFrequency(768L),
+      AcFrequencyMin(769L),
+      AcFrequencyMax(770L),
+      NeutralCurrent(771L),
+      TotalActivePower(772L),
+      TotalReactivePower(773L),
+      TotalApparentPower(774L),
+      Measured1stHarmonicCurrent(775L),
+      Measured3rdHarmonicCurrent(776L),
+      Measured5thHarmonicCurrent(777L),
+      Measured7thHarmonicCurrent(778L),
+      Measured9thHarmonicCurrent(779L),
+      Measured11thHarmonicCurrent(780L),
+      MeasuredPhase1stHarmonicCurrent(781L),
+      MeasuredPhase3rdHarmonicCurrent(782L),
+      MeasuredPhase5thHarmonicCurrent(783L),
+      MeasuredPhase7thHarmonicCurrent(784L),
+      MeasuredPhase9thHarmonicCurrent(785L),
+      MeasuredPhase11thHarmonicCurrent(786L),
+      AcFrequencyMultiplier(1024L),
+      AcFrequencyDivisor(1025L),
+      PowerMultiplier(1026L),
+      PowerDivisor(1027L),
+      HarmonicCurrentMultiplier(1028L),
+      PhaseHarmonicCurrentMultiplier(1029L),
+      InstantaneousVoltage(1280L),
+      InstantaneousLineCurrent(1281L),
+      InstantaneousActiveCurrent(1282L),
+      InstantaneousReactiveCurrent(1283L),
+      InstantaneousPower(1284L),
+      RmsVoltage(1285L),
+      RmsVoltageMin(1286L),
+      RmsVoltageMax(1287L),
+      RmsCurrent(1288L),
+      RmsCurrentMin(1289L),
+      RmsCurrentMax(1290L),
+      ActivePower(1291L),
+      ActivePowerMin(1292L),
+      ActivePowerMax(1293L),
+      ReactivePower(1294L),
+      ApparentPower(1295L),
+      PowerFactor(1296L),
+      AverageRmsVoltageMeasurementPeriod(1297L),
+      AverageRmsUnderVoltageCounter(1299L),
+      RmsExtremeOverVoltagePeriod(1300L),
+      RmsExtremeUnderVoltagePeriod(1301L),
+      RmsVoltageSagPeriod(1302L),
+      RmsVoltageSwellPeriod(1303L),
+      AcVoltageMultiplier(1536L),
+      AcVoltageDivisor(1537L),
+      AcCurrentMultiplier(1538L),
+      AcCurrentDivisor(1539L),
+      AcPowerMultiplier(1540L),
+      AcPowerDivisor(1541L),
+      OverloadAlarmsMask(1792L),
+      VoltageOverload(1793L),
+      CurrentOverload(1794L),
+      AcOverloadAlarmsMask(2048L),
+      AcVoltageOverload(2049L),
+      AcCurrentOverload(2050L),
+      AcActivePowerOverload(2051L),
+      AcReactivePowerOverload(2052L),
+      AverageRmsOverVoltage(2053L),
+      AverageRmsUnderVoltage(2054L),
+      RmsExtremeOverVoltage(2055L),
+      RmsExtremeUnderVoltage(2056L),
+      RmsVoltageSag(2057L),
+      RmsVoltageSwell(2058L),
+      LineCurrentPhaseB(2305L),
+      ActiveCurrentPhaseB(2306L),
+      ReactiveCurrentPhaseB(2307L),
+      RmsVoltagePhaseB(2309L),
+      RmsVoltageMinPhaseB(2310L),
+      RmsVoltageMaxPhaseB(2311L),
+      RmsCurrentPhaseB(2312L),
+      RmsCurrentMinPhaseB(2313L),
+      RmsCurrentMaxPhaseB(2314L),
+      ActivePowerPhaseB(2315L),
+      ActivePowerMinPhaseB(2316L),
+      ActivePowerMaxPhaseB(2317L),
+      ReactivePowerPhaseB(2318L),
+      ApparentPowerPhaseB(2319L),
+      PowerFactorPhaseB(2320L),
+      AverageRmsVoltageMeasurementPeriodPhaseB(2321L),
+      AverageRmsOverVoltageCounterPhaseB(2322L),
+      AverageRmsUnderVoltageCounterPhaseB(2323L),
+      RmsExtremeOverVoltagePeriodPhaseB(2324L),
+      RmsExtremeUnderVoltagePeriodPhaseB(2325L),
+      RmsVoltageSagPeriodPhaseB(2326L),
+      RmsVoltageSwellPeriodPhaseB(2327L),
+      LineCurrentPhaseC(2561L),
+      ActiveCurrentPhaseC(2562L),
+      ReactiveCurrentPhaseC(2563L),
+      RmsVoltagePhaseC(2565L),
+      RmsVoltageMinPhaseC(2566L),
+      RmsVoltageMaxPhaseC(2567L),
+      RmsCurrentPhaseC(2568L),
+      RmsCurrentMinPhaseC(2569L),
+      RmsCurrentMaxPhaseC(2570L),
+      ActivePowerPhaseC(2571L),
+      ActivePowerMinPhaseC(2572L),
+      ActivePowerMaxPhaseC(2573L),
+      ReactivePowerPhaseC(2574L),
+      ApparentPowerPhaseC(2575L),
+      PowerFactorPhaseC(2576L),
+      AverageRmsVoltageMeasurementPeriodPhaseC(2577L),
+      AverageRmsOverVoltageCounterPhaseC(2578L),
+      AverageRmsUnderVoltageCounterPhaseC(2579L),
+      RmsExtremeOverVoltagePeriodPhaseC(2580L),
+      RmsExtremeUnderVoltagePeriodPhaseC(2581L),
+      RmsVoltageSagPeriodPhaseC(2582L),
+      RmsVoltageSwellPeriodPhaseC(2583L),
+      GeneratedCommandList(65528L),
+      AcceptedCommandList(65529L),
+      EventList(65530L),
+      AttributeList(65531L),
+      FeatureMap(65532L),
+      ClusterRevision(65533L),
+      ;
+      private final long id;
+
+      Attribute(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Attribute value(long id) throws NoSuchFieldError {
+        for (Attribute attribute : Attribute.values()) {
+          if (attribute.getID() == id) {
+            return attribute;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum Event {
+      ;
+      private final long id;
+
+      Event(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Event value(long id) throws NoSuchFieldError {
+        for (Event event : Event.values()) {
+          if (event.getID() == id) {
+            return event;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum Command {
+      GetProfileInfoCommand(0L),
+      GetMeasurementProfileCommand(1L),
+      ;
+      private final long id;
+
+      Command(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Command value(long id) throws NoSuchFieldError {
+        for (Command command : Command.values()) {
+          if (command.getID() == id) {
+            return command;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum GetMeasurementProfileCommandCommandField {
+      AttributeId(0),
+      StartTime(1),
+      NumberOfIntervals(2),
+      ;
+      private final int id;
+
+      GetMeasurementProfileCommandCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static GetMeasurementProfileCommandCommandField value(int id) throws NoSuchFieldError {
+        for (GetMeasurementProfileCommandCommandField field :
+            GetMeasurementProfileCommandCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    @Override
+    public String getAttributeName(long id) throws NoSuchFieldError {
+      return Attribute.value(id).toString();
+    }
+
+    @Override
+    public String getEventName(long id) throws NoSuchFieldError {
+      return Event.value(id).toString();
+    }
+
+    @Override
+    public String getCommandName(long id) throws NoSuchFieldError {
+      return Command.value(id).toString();
+    }
+
+    @Override
+    public long getAttributeID(String name) throws IllegalArgumentException {
+      return Attribute.valueOf(name).getID();
+    }
+
+    @Override
+    public long getEventID(String name) throws IllegalArgumentException {
+      return Event.valueOf(name).getID();
+    }
+
+    @Override
+    public long getCommandID(String name) throws IllegalArgumentException {
+      return Command.valueOf(name).getID();
+    }
+  }
+
+  public static class UnitTesting implements BaseCluster {
+    public static final long ID = 4294048773L;
+
+    public long getID() {
+      return ID;
+    }
+
+    public enum Attribute {
+      Boolean(0L),
+      Bitmap8(1L),
+      Bitmap16(2L),
+      Bitmap32(3L),
+      Bitmap64(4L),
+      Int8u(5L),
+      Int16u(6L),
+      Int24u(7L),
+      Int32u(8L),
+      Int40u(9L),
+      Int48u(10L),
+      Int56u(11L),
+      Int64u(12L),
+      Int8s(13L),
+      Int16s(14L),
+      Int24s(15L),
+      Int32s(16L),
+      Int40s(17L),
+      Int48s(18L),
+      Int56s(19L),
+      Int64s(20L),
+      Enum8(21L),
+      Enum16(22L),
+      FloatSingle(23L),
+      FloatDouble(24L),
+      OctetString(25L),
+      ListInt8u(26L),
+      ListOctetString(27L),
+      ListStructOctetString(28L),
+      LongOctetString(29L),
+      CharString(30L),
+      LongCharString(31L),
+      EpochUs(32L),
+      EpochS(33L),
+      VendorId(34L),
+      ListNullablesAndOptionalsStruct(35L),
+      EnumAttr(36L),
+      StructAttr(37L),
+      RangeRestrictedInt8u(38L),
+      RangeRestrictedInt8s(39L),
+      RangeRestrictedInt16u(40L),
+      RangeRestrictedInt16s(41L),
+      ListLongOctetString(42L),
+      ListFabricScoped(43L),
+      TimedWriteBoolean(48L),
+      GeneralErrorBoolean(49L),
+      ClusterErrorBoolean(50L),
+      Unsupported(255L),
+      NullableBoolean(16384L),
+      NullableBitmap8(16385L),
+      NullableBitmap16(16386L),
+      NullableBitmap32(16387L),
+      NullableBitmap64(16388L),
+      NullableInt8u(16389L),
+      NullableInt16u(16390L),
+      NullableInt24u(16391L),
+      NullableInt32u(16392L),
+      NullableInt40u(16393L),
+      NullableInt48u(16394L),
+      NullableInt56u(16395L),
+      NullableInt64u(16396L),
+      NullableInt8s(16397L),
+      NullableInt16s(16398L),
+      NullableInt24s(16399L),
+      NullableInt32s(16400L),
+      NullableInt40s(16401L),
+      NullableInt48s(16402L),
+      NullableInt56s(16403L),
+      NullableInt64s(16404L),
+      NullableEnum8(16405L),
+      NullableEnum16(16406L),
+      NullableFloatSingle(16407L),
+      NullableFloatDouble(16408L),
+      NullableOctetString(16409L),
+      NullableCharString(16414L),
+      NullableEnumAttr(16420L),
+      NullableStruct(16421L),
+      NullableRangeRestrictedInt8u(16422L),
+      NullableRangeRestrictedInt8s(16423L),
+      NullableRangeRestrictedInt16u(16424L),
+      NullableRangeRestrictedInt16s(16425L),
+      WriteOnlyInt8u(16426L),
+      GeneratedCommandList(65528L),
+      AcceptedCommandList(65529L),
+      EventList(65530L),
+      AttributeList(65531L),
+      FeatureMap(65532L),
+      ClusterRevision(65533L),
+      ;
+      private final long id;
+
+      Attribute(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Attribute value(long id) throws NoSuchFieldError {
+        for (Attribute attribute : Attribute.values()) {
+          if (attribute.getID() == id) {
+            return attribute;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum Event {
+      TestEvent(1L),
+      TestFabricScopedEvent(2L),
+      ;
+      private final long id;
+
+      Event(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Event value(long id) throws NoSuchFieldError {
+        for (Event event : Event.values()) {
+          if (event.getID() == id) {
+            return event;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum Command {
+      Test(0L),
+      TestNotHandled(1L),
+      TestSpecific(2L),
+      TestUnknownCommand(3L),
+      TestAddArguments(4L),
+      TestSimpleArgumentRequest(5L),
+      TestStructArrayArgumentRequest(6L),
+      TestStructArgumentRequest(7L),
+      TestNestedStructArgumentRequest(8L),
+      TestListStructArgumentRequest(9L),
+      TestListInt8UArgumentRequest(10L),
+      TestNestedStructListArgumentRequest(11L),
+      TestListNestedStructListArgumentRequest(12L),
+      TestListInt8UReverseRequest(13L),
+      TestEnumsRequest(14L),
+      TestNullableOptionalRequest(15L),
+      TestComplexNullableOptionalRequest(16L),
+      SimpleStructEchoRequest(17L),
+      TimedInvokeRequest(18L),
+      TestSimpleOptionalArgumentRequest(19L),
+      TestEmitTestEventRequest(20L),
+      TestEmitTestFabricScopedEventRequest(21L),
+      ;
+      private final long id;
+
+      Command(long id) {
+        this.id = id;
+      }
+
+      public long getID() {
+        return id;
+      }
+
+      public static Command value(long id) throws NoSuchFieldError {
+        for (Command command : Command.values()) {
+          if (command.getID() == id) {
+            return command;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum TestAddArgumentsCommandField {
+      Arg1(0),
+      Arg2(1),
+      ;
+      private final int id;
+
+      TestAddArgumentsCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static TestAddArgumentsCommandField value(int id) throws NoSuchFieldError {
+        for (TestAddArgumentsCommandField field : TestAddArgumentsCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum TestSimpleArgumentRequestCommandField {
+      Arg1(0),
+      ;
+      private final int id;
+
+      TestSimpleArgumentRequestCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static TestSimpleArgumentRequestCommandField value(int id) throws NoSuchFieldError {
+        for (TestSimpleArgumentRequestCommandField field :
+            TestSimpleArgumentRequestCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum TestStructArrayArgumentRequestCommandField {
+      Arg1(0),
+      Arg2(1),
+      Arg3(2),
+      Arg4(3),
+      Arg5(4),
+      Arg6(5),
+      ;
+      private final int id;
+
+      TestStructArrayArgumentRequestCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static TestStructArrayArgumentRequestCommandField value(int id)
+          throws NoSuchFieldError {
+        for (TestStructArrayArgumentRequestCommandField field :
+            TestStructArrayArgumentRequestCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum TestStructArgumentRequestCommandField {
+      Arg1(0),
+      ;
+      private final int id;
+
+      TestStructArgumentRequestCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static TestStructArgumentRequestCommandField value(int id) throws NoSuchFieldError {
+        for (TestStructArgumentRequestCommandField field :
+            TestStructArgumentRequestCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum TestNestedStructArgumentRequestCommandField {
+      Arg1(0),
+      ;
+      private final int id;
+
+      TestNestedStructArgumentRequestCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static TestNestedStructArgumentRequestCommandField value(int id)
+          throws NoSuchFieldError {
+        for (TestNestedStructArgumentRequestCommandField field :
+            TestNestedStructArgumentRequestCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum TestListStructArgumentRequestCommandField {
+      Arg1(0),
+      ;
+      private final int id;
+
+      TestListStructArgumentRequestCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static TestListStructArgumentRequestCommandField value(int id)
+          throws NoSuchFieldError {
+        for (TestListStructArgumentRequestCommandField field :
+            TestListStructArgumentRequestCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum TestListInt8UArgumentRequestCommandField {
+      Arg1(0),
+      ;
+      private final int id;
+
+      TestListInt8UArgumentRequestCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static TestListInt8UArgumentRequestCommandField value(int id) throws NoSuchFieldError {
+        for (TestListInt8UArgumentRequestCommandField field :
+            TestListInt8UArgumentRequestCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum TestNestedStructListArgumentRequestCommandField {
+      Arg1(0),
+      ;
+      private final int id;
+
+      TestNestedStructListArgumentRequestCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static TestNestedStructListArgumentRequestCommandField value(int id)
+          throws NoSuchFieldError {
+        for (TestNestedStructListArgumentRequestCommandField field :
+            TestNestedStructListArgumentRequestCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum TestListNestedStructListArgumentRequestCommandField {
+      Arg1(0),
+      ;
+      private final int id;
 
-      Attribute(long id) {
+      TestListNestedStructListArgumentRequestCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Attribute value(long id) throws NoSuchFieldError {
-        for (Attribute attribute : Attribute.values()) {
-          if (attribute.getID() == id) {
-            return attribute;
+      public static TestListNestedStructListArgumentRequestCommandField value(int id)
+          throws NoSuchFieldError {
+        for (TestListNestedStructListArgumentRequestCommandField field :
+            TestListNestedStructListArgumentRequestCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
       }
     }
 
-    public enum Event {
+    public enum TestListInt8UReverseRequestCommandField {
+      Arg1(0),
       ;
-      private final long id;
+      private final int id;
 
-      Event(long id) {
+      TestListInt8UReverseRequestCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Event value(long id) throws NoSuchFieldError {
-        for (Event event : Event.values()) {
-          if (event.getID() == id) {
-            return event;
+      public static TestListInt8UReverseRequestCommandField value(int id) throws NoSuchFieldError {
+        for (TestListInt8UReverseRequestCommandField field :
+            TestListInt8UReverseRequestCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
       }
     }
 
-    public enum Command {
-      GetProfileInfoCommand(0L),
-      GetMeasurementProfileCommand(1L),
+    public enum TestEnumsRequestCommandField {
+      Arg1(0),
+      Arg2(1),
       ;
-      private final long id;
+      private final int id;
 
-      Command(long id) {
+      TestEnumsRequestCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Command value(long id) throws NoSuchFieldError {
-        for (Command command : Command.values()) {
-          if (command.getID() == id) {
-            return command;
+      public static TestEnumsRequestCommandField value(int id) throws NoSuchFieldError {
+        for (TestEnumsRequestCommandField field : TestEnumsRequestCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
       }
     }
 
-    @Override
-    public String getAttributeName(long id) throws NoSuchFieldError {
-      return Attribute.value(id).toString();
-    }
+    public enum TestNullableOptionalRequestCommandField {
+      Arg1(0),
+      ;
+      private final int id;
 
-    @Override
-    public String getEventName(long id) throws NoSuchFieldError {
-      return Event.value(id).toString();
-    }
+      TestNullableOptionalRequestCommandField(int id) {
+        this.id = id;
+      }
 
-    @Override
-    public String getCommandName(long id) throws NoSuchFieldError {
-      return Command.value(id).toString();
-    }
+      public int getID() {
+        return id;
+      }
 
-    @Override
-    public long getAttributeID(String name) throws IllegalArgumentException {
-      return Attribute.valueOf(name).getID();
+      public static TestNullableOptionalRequestCommandField value(int id) throws NoSuchFieldError {
+        for (TestNullableOptionalRequestCommandField field :
+            TestNullableOptionalRequestCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
     }
 
-    @Override
-    public long getEventID(String name) throws IllegalArgumentException {
-      return Event.valueOf(name).getID();
-    }
+    public enum TestComplexNullableOptionalRequestCommandField {
+      NullableInt(0),
+      OptionalInt(1),
+      NullableOptionalInt(2),
+      NullableString(3),
+      OptionalString(4),
+      NullableOptionalString(5),
+      NullableStruct(6),
+      OptionalStruct(7),
+      NullableOptionalStruct(8),
+      NullableList(9),
+      OptionalList(10),
+      NullableOptionalList(11),
+      ;
+      private final int id;
 
-    @Override
-    public long getCommandID(String name) throws IllegalArgumentException {
-      return Command.valueOf(name).getID();
+      TestComplexNullableOptionalRequestCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static TestComplexNullableOptionalRequestCommandField value(int id)
+          throws NoSuchFieldError {
+        for (TestComplexNullableOptionalRequestCommandField field :
+            TestComplexNullableOptionalRequestCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
     }
-  }
 
-  public static class UnitTesting implements BaseCluster {
-    public static final long ID = 4294048773L;
+    public enum SimpleStructEchoRequestCommandField {
+      Arg1(0),
+      ;
+      private final int id;
 
-    public long getID() {
-      return ID;
+      SimpleStructEchoRequestCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static SimpleStructEchoRequestCommandField value(int id) throws NoSuchFieldError {
+        for (SimpleStructEchoRequestCommandField field :
+            SimpleStructEchoRequestCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
     }
 
-    public enum Attribute {
-      Boolean(0L),
-      Bitmap8(1L),
-      Bitmap16(2L),
-      Bitmap32(3L),
-      Bitmap64(4L),
-      Int8u(5L),
-      Int16u(6L),
-      Int24u(7L),
-      Int32u(8L),
-      Int40u(9L),
-      Int48u(10L),
-      Int56u(11L),
-      Int64u(12L),
-      Int8s(13L),
-      Int16s(14L),
-      Int24s(15L),
-      Int32s(16L),
-      Int40s(17L),
-      Int48s(18L),
-      Int56s(19L),
-      Int64s(20L),
-      Enum8(21L),
-      Enum16(22L),
-      FloatSingle(23L),
-      FloatDouble(24L),
-      OctetString(25L),
-      ListInt8u(26L),
-      ListOctetString(27L),
-      ListStructOctetString(28L),
-      LongOctetString(29L),
-      CharString(30L),
-      LongCharString(31L),
-      EpochUs(32L),
-      EpochS(33L),
-      VendorId(34L),
-      ListNullablesAndOptionalsStruct(35L),
-      EnumAttr(36L),
-      StructAttr(37L),
-      RangeRestrictedInt8u(38L),
-      RangeRestrictedInt8s(39L),
-      RangeRestrictedInt16u(40L),
-      RangeRestrictedInt16s(41L),
-      ListLongOctetString(42L),
-      ListFabricScoped(43L),
-      TimedWriteBoolean(48L),
-      GeneralErrorBoolean(49L),
-      ClusterErrorBoolean(50L),
-      Unsupported(255L),
-      NullableBoolean(16384L),
-      NullableBitmap8(16385L),
-      NullableBitmap16(16386L),
-      NullableBitmap32(16387L),
-      NullableBitmap64(16388L),
-      NullableInt8u(16389L),
-      NullableInt16u(16390L),
-      NullableInt24u(16391L),
-      NullableInt32u(16392L),
-      NullableInt40u(16393L),
-      NullableInt48u(16394L),
-      NullableInt56u(16395L),
-      NullableInt64u(16396L),
-      NullableInt8s(16397L),
-      NullableInt16s(16398L),
-      NullableInt24s(16399L),
-      NullableInt32s(16400L),
-      NullableInt40s(16401L),
-      NullableInt48s(16402L),
-      NullableInt56s(16403L),
-      NullableInt64s(16404L),
-      NullableEnum8(16405L),
-      NullableEnum16(16406L),
-      NullableFloatSingle(16407L),
-      NullableFloatDouble(16408L),
-      NullableOctetString(16409L),
-      NullableCharString(16414L),
-      NullableEnumAttr(16420L),
-      NullableStruct(16421L),
-      NullableRangeRestrictedInt8u(16422L),
-      NullableRangeRestrictedInt8s(16423L),
-      NullableRangeRestrictedInt16u(16424L),
-      NullableRangeRestrictedInt16s(16425L),
-      WriteOnlyInt8u(16426L),
-      GeneratedCommandList(65528L),
-      AcceptedCommandList(65529L),
-      EventList(65530L),
-      AttributeList(65531L),
-      FeatureMap(65532L),
-      ClusterRevision(65533L),
+    public enum TestSimpleOptionalArgumentRequestCommandField {
+      Arg1(0),
       ;
-      private final long id;
+      private final int id;
 
-      Attribute(long id) {
+      TestSimpleOptionalArgumentRequestCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Attribute value(long id) throws NoSuchFieldError {
-        for (Attribute attribute : Attribute.values()) {
-          if (attribute.getID() == id) {
-            return attribute;
+      public static TestSimpleOptionalArgumentRequestCommandField value(int id)
+          throws NoSuchFieldError {
+        for (TestSimpleOptionalArgumentRequestCommandField field :
+            TestSimpleOptionalArgumentRequestCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
       }
     }
 
-    public enum Event {
-      TestEvent(1L),
-      TestFabricScopedEvent(2L),
+    public enum TestEmitTestEventRequestCommandField {
+      Arg1(0),
+      Arg2(1),
+      Arg3(2),
       ;
-      private final long id;
+      private final int id;
 
-      Event(long id) {
+      TestEmitTestEventRequestCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Event value(long id) throws NoSuchFieldError {
-        for (Event event : Event.values()) {
-          if (event.getID() == id) {
-            return event;
+      public static TestEmitTestEventRequestCommandField value(int id) throws NoSuchFieldError {
+        for (TestEmitTestEventRequestCommandField field :
+            TestEmitTestEventRequestCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
       }
     }
 
-    public enum Command {
-      Test(0L),
-      TestNotHandled(1L),
-      TestSpecific(2L),
-      TestUnknownCommand(3L),
-      TestAddArguments(4L),
-      TestSimpleArgumentRequest(5L),
-      TestStructArrayArgumentRequest(6L),
-      TestStructArgumentRequest(7L),
-      TestNestedStructArgumentRequest(8L),
-      TestListStructArgumentRequest(9L),
-      TestListInt8UArgumentRequest(10L),
-      TestNestedStructListArgumentRequest(11L),
-      TestListNestedStructListArgumentRequest(12L),
-      TestListInt8UReverseRequest(13L),
-      TestEnumsRequest(14L),
-      TestNullableOptionalRequest(15L),
-      TestComplexNullableOptionalRequest(16L),
-      SimpleStructEchoRequest(17L),
-      TimedInvokeRequest(18L),
-      TestSimpleOptionalArgumentRequest(19L),
-      TestEmitTestEventRequest(20L),
-      TestEmitTestFabricScopedEventRequest(21L),
+    public enum TestEmitTestFabricScopedEventRequestCommandField {
+      Arg1(0),
       ;
-      private final long id;
+      private final int id;
 
-      Command(long id) {
+      TestEmitTestFabricScopedEventRequestCommandField(int id) {
         this.id = id;
       }
 
-      public long getID() {
+      public int getID() {
         return id;
       }
 
-      public static Command value(long id) throws NoSuchFieldError {
-        for (Command command : Command.values()) {
-          if (command.getID() == id) {
-            return command;
+      public static TestEmitTestFabricScopedEventRequestCommandField value(int id)
+          throws NoSuchFieldError {
+        for (TestEmitTestFabricScopedEventRequestCommandField field :
+            TestEmitTestFabricScopedEventRequestCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
           }
         }
         throw new NoSuchFieldError();
@@ -11092,6 +15081,58 @@ public static Command value(long id) throws NoSuchFieldError {
       }
     }
 
+    public enum FailAtFaultCommandField {
+      Type(0),
+      Id(1),
+      NumCallsToSkip(2),
+      NumCallsToFail(3),
+      TakeMutex(4),
+      ;
+      private final int id;
+
+      FailAtFaultCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static FailAtFaultCommandField value(int id) throws NoSuchFieldError {
+        for (FailAtFaultCommandField field : FailAtFaultCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
+    public enum FailRandomlyAtFaultCommandField {
+      Type(0),
+      Id(1),
+      Percentage(2),
+      ;
+      private final int id;
+
+      FailRandomlyAtFaultCommandField(int id) {
+        this.id = id;
+      }
+
+      public int getID() {
+        return id;
+      }
+
+      public static FailRandomlyAtFaultCommandField value(int id) throws NoSuchFieldError {
+        for (FailRandomlyAtFaultCommandField field : FailRandomlyAtFaultCommandField.values()) {
+          if (field.getID() == id) {
+            return field;
+          }
+        }
+        throw new NoSuchFieldError();
+      }
+    }
+
     @Override
     public String getAttributeName(long id) throws NoSuchFieldError {
       return Attribute.value(id).toString();